diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..84cf8ff0860 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,42 @@ +* text eol=lf + +*.[jJ][aA][rR] binary + +*.[pP][nN][gG] binary +*.[jJ][pP][gG] binary +*.[jJ][pP][eE][gG] binary +*.[gG][iI][fF] binary +*.[tT][iI][fF] binary +*.[tT][iI][fF][fF] binary +*.[iI][cC][oO] binary +*.[sS][vV][gG] text +*.[eE][pP][sS] binary +*.[xX][cC][fF] binary + +*.[kK][aA][rR] binary +*.[mM]4[aA] binary +*.[mM][iI][dD] binary +*.[mM][iI][dD][iI] binary +*.[mM][pP]3 binary +*.[oO][gG][gG] binary +*.[rR][aA] binary + +*.7[zZ] binary +*.[gG][zZ] binary +*.[tT][aA][rR] binary +*.[tT][gG][zZ] binary +*.[zZ][iI][pP] binary + +*.[tT][cC][nN] binary +*.[sS][oO] binary +*.[dD][lL][lL] binary +*.[dD][yY][lL][iI][bB] binary +*.[pP][sS][dD] binary + +*.[pP][aA][tT][cC][hH] -text + +*.[bB][aA][tT] text eol=crlf +*.[cC][mM][dD] text eol=crlf +*.[pP][sS]1 text eol=crlf + +*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary diff --git a/build.gradle b/build.gradle index c09bee22f3f..252dac4ea1b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,40 @@ -//version: 1652851397 +//version: 1662920829 /* -DO NOT CHANGE THIS FILE! - -Also, you may replace this file at any time if there is an update available. -Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates. -*/ + DO NOT CHANGE THIS FILE! + Also, you may replace this file at any time if there is an update available. + Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates. + */ import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.matthewprenger.cursegradle.CurseArtifact +import com.matthewprenger.cursegradle.CurseRelation +import com.modrinth.minotaur.dependencies.ModDependency +import com.modrinth.minotaur.dependencies.VersionDependency import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory +import java.nio.file.Files +import java.nio.file.Paths import java.util.concurrent.TimeUnit +import java.util.zip.ZipEntry +import java.util.zip.ZipInputStream +import java.util.zip.ZipOutputStream buildscript { repositories { + mavenCentral() + maven { name 'forge' url 'https://maven.minecraftforge.net' } + maven { + // GTNH ForgeGradle Fork + name = "GTNH Maven" + url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" + } maven { name 'sonatype' url 'https://oss.sonatype.org/content/repositories/snapshots/' @@ -28,31 +43,39 @@ buildscript { name 'Scala CI dependencies' url 'https://repo1.maven.org/maven2/' } - maven { - name 'jitpack' - url 'https://jitpack.io' - } } dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9' } } - plugins { id 'java-library' id 'idea' id 'eclipse' id 'scala' id 'maven-publish' - id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false - id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false - id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false - id 'org.ajoberstar.grgit' version '4.1.1' + id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false + id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false + id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false + id 'org.ajoberstar.grgit' version '4.1.1' id 'com.github.johnrengelman.shadow' version '4.0.4' - id 'com.palantir.git-version' version '0.13.0' apply false - id 'de.undercouch.download' version '5.0.1' - id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false + id 'com.palantir.git-version' version '0.13.0' apply false + id 'de.undercouch.download' version '5.0.1' + id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false + id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.modrinth.minotaur' version '2.+' apply false + id 'com.matthewprenger.cursegradle' version '1.4.0' apply false } +boolean settingsupdated = verifySettingsGradle() +settingsupdated = verifyGitAttributes() || settingsupdated +if (settingsupdated) + throw new GradleException("Settings has been updated, please re-run task.") + +dependencies { + implementation 'com.diffplug:blowdryer:1.6.0' +} + +apply plugin: 'com.diffplug.blowdryer' if (project.file('.git/HEAD').isFile()) { apply plugin: 'com.palantir.git-version' @@ -78,7 +101,14 @@ idea { } } -if(JavaVersion.current() != JavaVersion.VERSION_1_8) { +boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false + +if (!disableSpotless) { + apply plugin: 'com.diffplug.spotless' + apply from: Blowdryer.file('spotless.gradle') +} + +if (JavaVersion.current() != JavaVersion.VERSION_1_8) { throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current()) } @@ -103,8 +133,15 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly") checkPropertyExists("usesShadowedDependencies") checkPropertyExists("developmentEnvironmentUserName") -boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false -boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() +propertyDefaultIfUnset("noPublishedSources", false) +propertyDefaultIfUnset("usesMixinDebug", project.usesMixins) +propertyDefaultIfUnset("forceEnableMixins", false) +propertyDefaultIfUnset("channel", "stable") +propertyDefaultIfUnset("mappingsVersion", "12") +propertyDefaultIfUnset("modrinthProjectId", "") +propertyDefaultIfUnset("modrinthRelations", "") +propertyDefaultIfUnset("curseForgeProjectId", "") +propertyDefaultIfUnset("curseForgeRelations", "") String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" @@ -113,53 +150,53 @@ String kotlinSourceDir = "src/main/kotlin/" String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") -if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { +if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } -if(apiPackage) { +if (apiPackage) { targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") - if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { + if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } } -if(accessTransformersFile) { +if (accessTransformersFile) { String targetFile = "src/main/resources/META-INF/" + accessTransformersFile - if(!getFile(targetFile).exists()) { + if (!getFile(targetFile).exists()) { throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) } } -if(usesMixins.toBoolean()) { - if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) { +if (usesMixins.toBoolean()) { + if (mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) { throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") } targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") - if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { - throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) + if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { + throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala" String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt" - if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { + if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) } } -if(coreModClass) { +if (coreModClass) { String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala" String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt" - if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { + if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) } } @@ -189,7 +226,7 @@ try { catch (Exception ignored) { out.style(Style.Failure).text( 'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' + - 'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' + + 'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' + 'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)' ) versionOverride = 'NO-GIT-TAG-SET' @@ -200,22 +237,21 @@ ext { modVersion = identifiedVersion } -if(identifiedVersion == versionOverride) { +if (identifiedVersion == versionOverride) { out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7') } group = modGroup -if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { +if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { archivesBaseName = customArchiveBaseName -} -else { +} else { archivesBaseName = modId } def arguments = [] def jvmArguments = [] -if (usesMixins.toBoolean()) { +if (usesMixins.toBoolean() || forceEnableMixins) { arguments += [ "--tweakClass org.spongepowered.asm.launch.MixinTweaker" ] @@ -234,16 +270,16 @@ minecraft { if (replaceGradleTokenInFile) { replaceIn replaceGradleTokenInFile - if(gradleTokenModId) { + if (gradleTokenModId) { replace gradleTokenModId, modId } - if(gradleTokenModName) { + if (gradleTokenModName) { replace gradleTokenModName, modName } - if(gradleTokenVersion) { + if (gradleTokenVersion) { replace gradleTokenVersion, modVersion } - if(gradleTokenGroupName) { + if (gradleTokenGroupName) { replace gradleTokenGroupName, modGroup } } @@ -252,7 +288,7 @@ minecraft { args(arguments) jvmArgs(jvmArguments) - if(developmentEnvironmentUserName) { + if (developmentEnvironmentUserName) { args("--username", developmentEnvironmentUserName) } } @@ -263,7 +299,7 @@ minecraft { } } -if(file('addon.gradle').exists()) { +if (file('addon.gradle').exists()) { apply from: 'addon.gradle' } @@ -280,7 +316,7 @@ repositories { name 'Overmind forge repo mirror' url 'https://gregtech.overminddl1.com/' } - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean() || forceEnableMixins) { maven { name 'sponge' url 'https://repo.spongepowered.org/repository/maven-public' @@ -292,11 +328,13 @@ repositories { } dependencies { - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT') + } + if (usesMixins.toBoolean() || forceEnableMixins) { // using 0.8 to workaround a issue in 0.7 which fails mixin application compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') { // Mixin includes a lot of dependencies that are too up-to-date @@ -354,7 +392,10 @@ shadowJar { } minimize() // This will only allow shading for actually used classes - configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile] + configurations = [ + project.configurations.shadowImplementation, + project.configurations.shadowCompile + ] dependsOn(relocateShadowJar) } @@ -369,38 +410,38 @@ jar { attributes(getManifestAttributes()) } - if(usesShadowedDependencies.toBoolean()) { + if (usesShadowedDependencies.toBoolean()) { dependsOn(shadowJar) enabled = false } } reobf { - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { addExtraSrgFile mixinSrg } } afterEvaluate { - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { tasks.compileJava { options.compilerArgs += [ - "-AreobfSrgFile=${tasks.reobf.srg}", - "-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" + "-AreobfSrgFile=${tasks.reobf.srg}", + "-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" ] } } } runClient { - if(developmentEnvironmentUserName) { + if (developmentEnvironmentUserName) { arguments += [ - "--username", - developmentEnvironmentUserName + "--username", + developmentEnvironmentUserName ] } @@ -415,9 +456,9 @@ runServer { tasks.withType(JavaExec).configureEach { javaLauncher.set( - javaToolchains.launcherFor { - languageVersion = projectJavaVersion - } + javaToolchains.launcherFor { + languageVersion = projectJavaVersion + } ) } @@ -425,6 +466,7 @@ processResources { // this will ensure that this task is redone when the versions change. inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version + exclude("spotless.gradle") // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { @@ -437,43 +479,44 @@ processResources { "modName": modName } - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { from refMap } // copy everything else that's not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' + exclude 'spotless.gradle' } } def getManifestAttributes() { def manifestAttributes = [:] - if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) { + if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) { manifestAttributes += ["FMLCorePluginContainsFMLMod": true] } - if(accessTransformersFile) { - manifestAttributes += ["FMLAT" : accessTransformersFile.toString()] + if (accessTransformersFile) { + manifestAttributes += ["FMLAT": accessTransformersFile.toString()] } - if(coreModClass) { + if (coreModClass) { manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass] } - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { manifestAttributes += [ - "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", - "MixinConfigs" : "mixins." + modId + ".json", - "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean() + "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", + "MixinConfigs" : "mixins." + modId + ".json", + "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean() ] } return manifestAttributes } task sourcesJar(type: Jar) { - from (sourceSets.main.allSource) - from (file("$projectDir/LICENSE")) + from(sourceSets.main.allSource) + from(file("$projectDir/LICENSE")) getArchiveClassifier().set('sources') } @@ -492,7 +535,10 @@ task shadowDevJar(type: ShadowJar) { } minimize() // This will only allow shading for actually used classes - configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile] + configurations = [ + project.configurations.shadowImplementation, + project.configurations.shadowCompile + ] } task relocateShadowDevJar(type: ConfigureShadowRelocation) { @@ -520,22 +566,22 @@ task devJar(type: Jar) { attributes(getManifestAttributes()) } - if(usesShadowedDependencies.toBoolean()) { + if (usesShadowedDependencies.toBoolean()) { dependsOn(circularResolverJar) enabled = false } } task apiJar(type: Jar) { - from (sourceSets.main.allSource) { + from(sourceSets.main.allSource) { include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' } - from (sourceSets.main.output) { + from(sourceSets.main.output) { include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' } - from (sourceSets.main.resources.srcDirs) { + from(sourceSets.main.resources.srcDirs) { include("LICENSE") } @@ -543,11 +589,11 @@ task apiJar(type: Jar) { } artifacts { - if(!noPublishedSources) { + if (!noPublishedSources) { archives sourcesJar } archives devJar - if(apiPackage) { + if (apiPackage) { archives apiJar } } @@ -565,10 +611,10 @@ publishing { publications { maven(MavenPublication) { from components.java - if(usesShadowedDependencies.toBoolean()) { + if (usesShadowedDependencies.toBoolean()) { artifact source: shadowJar, classifier: "" } - if(!noPublishedSources) { + if (!noPublishedSources) { artifact source: sourcesJar, classifier: "sources" } artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev" @@ -583,8 +629,11 @@ publishing { // remove extra garbage from minecraft and minecraftDeps configuration pom.withXml { - def badArtifacts = [:].withDefault {[] as Set} - for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) { + def badArtifacts = [:].withDefault { [] as Set } + for (configuration in [ + projectConfigs.minecraft, + projectConfigs.minecraftDeps + ]) { for (dependency in configuration.allDependencies) { badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name } @@ -613,6 +662,107 @@ publishing { } } +if (modrinthProjectId.size() != 0) { + apply plugin: 'com.modrinth.minotaur' + + File changelogFile = new File("CHANGELOG.md") + + modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = modrinthProjectId + versionNumber = identifiedVersion + versionType = identifiedVersion.endsWith("-pre") ? "beta" : "release" + changelog = changelogFile.exists() ? changelogFile.getText("UTF-8") : "" + uploadFile = jar + additionalFiles = getSecondaryArtifacts() + gameVersions = [minecraftVersion] + loaders = ["forge"] + debugMode = false + } + + if (modrinthRelations.size() != 0) { + String[] deps = modrinthRelations.split(";") + deps.each { dep -> + if (dep.size() == 0) { + return + } + String[] parts = dep.split(":") + String[] qual = parts[0].split("-") + addModrinthDep(qual[0], qual[1], parts[1]) + } + } + tasks.modrinth.dependsOn(build) + tasks.publish.dependsOn(tasks.modrinth) +} + +if (curseForgeProjectId.size() != 0) { + apply plugin: 'com.matthewprenger.cursegradle' + + File changelogFile = new File("CHANGELOG.md") + + curseforge { + apiKey = System.getenv("CURSEFORGE_TOKEN") + project { + id = curseForgeProjectId + if (changelogFile.exists()) { + changelogType = "markdown" + changelog = changelogFile + } + releaseType = identifiedVersion.endsWith("-pre") ? "beta" : "release" + addGameVersion minecraftVersion + addGameVersion "Forge" + mainArtifact jar + for (artifact in getSecondaryArtifacts()) addArtifact artifact + } + + options { + javaIntegration = false + forgeGradleIntegration = false + debug = false + } + } + + if (curseForgeRelations.size() != 0) { + String[] deps = curseForgeRelations.split(";") + deps.each { dep -> + if (dep.size() == 0) { + return + } + String[] parts = dep.split(":") + addCurseForgeRelation(parts[0], parts[1]) + } + } + tasks.curseforge.dependsOn(build) + tasks.publish.dependsOn(tasks.curseforge) +} + +def addModrinthDep(scope, type, name) { + com.modrinth.minotaur.dependencies.Dependency dep; + if (!(scope in ["required", "optional", "incompatible", "embedded"])) { + throw new Exception("Invalid modrinth dependency scope: " + scope) + } + switch (type) { + case "project": + dep = new ModDependency(name, scope) + break + case "version": + dep = new VersionDependency(name, scope) + break + default: + throw new Exception("Invalid modrinth dependency type: " + type) + } + project.modrinth.dependencies.add(dep) +} + +def addCurseForgeRelation(type, name) { + if (!(type in ["requiredDependency", "embeddedLibrary", "optionalDependency", "tool", "incompatible"])) { + throw new Exception("Invalid CurseForge relation type: " + type) + } + CurseArtifact artifact = project.curseforge.curseProjects[0].mainArtifact + CurseRelation rel = (artifact.curseRelations ?: (artifact.curseRelations = new CurseRelation())) + rel."$type"(name) +} + // Updating task updateBuildScript { doLast { @@ -622,7 +772,7 @@ task updateBuildScript { } } -if (isNewBuildScriptVersionAvailable(projectDir.toString())) { +if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) { if (autoUpdateBuildScript.toBoolean()) { performBuildScriptUpdate(projectDir.toString()) } else { @@ -631,7 +781,40 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) { } static URL availableBuildScriptUrl() { - new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle") + new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle") +} + +static URL exampleSettingsGradleUrl() { + new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/settings.gradle.example") +} + +static URL exampleGitAttributesUrl() { + new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/.gitattributes") +} + + +boolean verifyGitAttributes() { + def gitattributesFile = getFile(".gitattributes") + if (!gitattributesFile.exists()) { + println("Downloading default .gitattributes") + exampleGitAttributesUrl().withInputStream { i -> gitattributesFile.withOutputStream { it << i } } + exec { + workingDir '.' + commandLine 'git', 'add', '--renormalize', '.' + } + return true + } + return false +} + +boolean verifySettingsGradle() { + def settingsFile = getFile("settings.gradle") + if (!settingsFile.exists()) { + println("Downloading default settings.gradle") + exampleSettingsGradleUrl().withInputStream { i -> settingsFile.withOutputStream { it << i } } + return true + } + return false } boolean performBuildScriptUpdate(String projectDir) { @@ -639,6 +822,10 @@ boolean performBuildScriptUpdate(String projectDir) { def buildscriptFile = getFile("build.gradle") availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } } out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!") + boolean settingsupdated = verifySettingsGradle() + settingsupdated = verifyGitAttributes() || settingsupdated + if (settingsupdated) + throw new GradleException("Settings has been updated, please re-run task.") return true } return false @@ -658,7 +845,7 @@ boolean isNewBuildScriptVersionAvailable(String projectDir) { static String getVersionHash(String buildScriptContent) { String versionLine = buildScriptContent.find("^//version: [a-z0-9]*") - if(versionLine != null) { + if (versionLine != null) { return versionLine.split(": ").last() } return "" @@ -669,7 +856,103 @@ configure(updateBuildScript) { description = 'Updates the build script to the latest version' } -// Deobfuscation +// Parameter Deobfuscation + +task deobfParams { + doLast { + + String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion" + String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip" + String paramsCSV = "$mcpDir/params.csv" + + download.run { + src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip" + dest mcpZIP + overwrite false + } + + if (!file(paramsCSV).exists()) { + println("Extracting MCP archive ...") + unzip(mcpZIP, mcpDir) + } + + println("Parsing params.csv ...") + Map params = new HashMap<>() + Files.lines(Paths.get(paramsCSV)).forEach { line -> + String[] cells = line.split(",") + if (cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) { + params.put(cells[0], cells[1]) + } + } + + out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!") + out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.") + } +} + +static int replaceParams(File file, Map params) { + int fileCount = 0 + + if (file.isDirectory()) { + for (File f : file.listFiles()) { + fileCount += replaceParams(f, params) + } + return fileCount + } + println("Visiting ${file.getName()} ...") + try { + String content = new String(Files.readAllBytes(file.toPath())) + int hash = content.hashCode() + params.forEach { key, value -> + content = content.replaceAll(key, value) + } + if (hash != content.hashCode()) { + Files.write(file.toPath(), content.getBytes("UTF-8")) + return 1 + } + } catch (Exception e) { + e.printStackTrace() + } + return 0 +} + +// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681) +static unzip(String zipFileName, String outputDir) { + byte[] buffer = new byte[16384] + ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName)) + ZipEntry zipEntry = zis.getNextEntry() + while (zipEntry != null) { + File newFile = new File(outputDir + File.separator, zipEntry.name) + if (zipEntry.isDirectory()) { + if (!newFile.isDirectory() && !newFile.mkdirs()) { + throw new IOException("Failed to create directory $newFile") + } + } else { + // fix for Windows-created archives + File parent = newFile.parentFile + if (!parent.isDirectory() && !parent.mkdirs()) { + throw new IOException("Failed to create directory $parent") + } + // write file content + FileOutputStream fos = new FileOutputStream(newFile) + int len = 0 + while ((len = zis.read(buffer)) > 0) { + fos.write(buffer, 0, len) + } + fos.close() + } + zipEntry = zis.getNextEntry() + } + zis.closeEntry() + zis.close() +} + +configure(deobfParams) { + group = 'forgegradle' + description = 'Rename all obfuscated parameter names inherited from Minecraft classes' +} + +// Dependency Deobfuscation def deobf(String sourceURL) { try { @@ -678,42 +961,57 @@ def deobf(String sourceURL) { //get rid of directories: int lastSlash = fileName.lastIndexOf("/") - if(lastSlash > 0) { + if (lastSlash > 0) { fileName = fileName.substring(lastSlash + 1) } //get rid of extension: - if(fileName.endsWith(".jar")) { + if (fileName.endsWith(".jar") || fileName.endsWith(".litemod")) { fileName = fileName.substring(0, fileName.lastIndexOf(".")) } String hostName = url.getHost() - if(hostName.startsWith("www.")) { + if (hostName.startsWith("www.")) { hostName = hostName.substring(4) } List parts = Arrays.asList(hostName.split("\\.")) Collections.reverse(parts) hostName = String.join(".", parts) - return deobf(sourceURL, hostName + "/" + fileName) - } catch(Exception e) { - return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode())) + return deobf(sourceURL, "$hostName/$fileName") + } catch (Exception e) { + return deobf(sourceURL, "deobf/${sourceURL.hashCode()}") } } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. -def deobf(String sourceURL, String fileName) { - String cacheDir = System.getProperty("user.home") + "/.gradle/caches/" - String bon2Dir = cacheDir + "forge_gradle/deobf" - String bon2File = bon2Dir + "/BON2-2.5.0.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()) { +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 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar' + 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 @@ -727,14 +1025,48 @@ def deobf(String sourceURL, String fileName) { } exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch' + commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' workingDir bon2Dir - standardOutput = new ByteArrayOutputStream() + standardOutput = new FileOutputStream("${deobfFile}.log") } return files(deobfFile) } +def zipMappings(String zipPath, String url, String bon2Dir) { + File zipFile = new File(zipPath) + if (zipFile.exists()) { + return + } + + String fieldsCache = "$bon2Dir/data/fields.csv" + String methodsCache = "$bon2Dir/data/methods.csv" + + download.run { + src "${url}fields.csv" + dest fieldsCache + quiet true + } + download.run { + src "${url}methods.csv" + dest methodsCache + quiet true + } + + zipFile.getParentFile().mkdirs() + ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) + + zos.putNextEntry(new ZipEntry("fields.csv")) + Files.copy(Paths.get(fieldsCache), zos) + zos.closeEntry() + + zos.putNextEntry(new ZipEntry("methods.csv")) + Files.copy(Paths.get(methodsCache), zos) + zos.closeEntry() + + zos.close() +} + // Helper methods def checkPropertyExists(String propertyName) { @@ -743,6 +1075,21 @@ def checkPropertyExists(String propertyName) { } } +def propertyDefaultIfUnset(String propertyName, defaultValue) { + if (!project.hasProperty(propertyName) || project.property(propertyName) == "") { + project.ext.setProperty(propertyName, defaultValue) + } +} + def getFile(String relativePath) { return new File(projectDir, relativePath) } + +def getSecondaryArtifacts() { + // Because noPublishedSources from the beginning of the script is somehow not visible here... + boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false + def secondaryArtifacts = [devJar] + if (!noPublishedSources) secondaryArtifacts += [sourcesJar] + if (apiPackage) secondaryArtifacts += [apiJar] + return secondaryArtifacts +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000000..93c852a12ca --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +plugins { + id 'com.diffplug.blowdryerSetup' version '1.6.0' +} + +apply plugin: 'com.diffplug.blowdryerSetup' + +blowdryerSetup { + github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5') + //devLocal '.' // Use this when testing config updates locally +} diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java index 13279ef6428..cc827b2d4fc 100644 --- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java @@ -6,6 +6,6 @@ */ public class UBAPIHook { public static final UBAPIHook ubAPIHook = new UBAPIHook(); - //public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes + // public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes public UBOreTexturizer ubOreTexturizer; } diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java index 947b156afbe..2c1019a300e 100644 --- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java @@ -21,13 +21,20 @@ public interface UBOreTexturizer { // that static vars are fully qualified names for all the textures in the UB pack, just pass as is // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick" public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event); + public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event); - public void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event); + + public void setupUBOre( + Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event); public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet; + public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet; - public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet; - public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld) ; + + public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) + throws BlocksAreAlreadySet; + + public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld); public static String amber_overlay = "undergroundbiomes:amber_overlay"; public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay"; @@ -50,7 +57,7 @@ public class BlocksAreAlreadySet extends RuntimeException { // this is thrown if UB has already run its pre-initialization step and can no longer register blocks public final Block oreBlock; public final String overlayName; - + public BlocksAreAlreadySet(Block oreBlock, String overlayName) { this.oreBlock = oreBlock; this.overlayName = overlayName; @@ -62,9 +69,8 @@ public String toString() { String overlayDescription = "undefined overlay"; if (oreBlock != null) blockDescription = oreBlock.getUnlocalizedName(); if (overlayName != null) overlayDescription = overlayName; - return "Attempt to create Underground Biomes ore for "+blockDescription+" with "+overlayDescription + - " after blocks have already been defined"; + return "Attempt to create Underground Biomes ore for " + blockDescription + " with " + overlayDescription + + " after blocks have already been defined"; } - } } diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 5fcd636d2f1..3d9496aab81 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -12,14 +12,14 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.relauncher.Side; +import java.util.Map; +import java.util.Random; import mantle.pulsar.config.ForgeCFG; import mantle.pulsar.control.PulseManager; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.MinecraftForge; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import tconstruct.achievements.AchievementEvents; import tconstruct.achievements.TAchievements; import tconstruct.api.TConstructAPI; @@ -36,13 +36,13 @@ import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.landmine.behavior.Behavior; import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; -import tconstruct.plugins.gears.TinkerGears; +import tconstruct.plugins.TinkerThaumcraft; import tconstruct.plugins.fmp.TinkerFMP; +import tconstruct.plugins.gears.TinkerGears; import tconstruct.plugins.ic2.TinkerIC2; import tconstruct.plugins.imc.TinkerAE2; import tconstruct.plugins.imc.TinkerBuildCraft; import tconstruct.plugins.imc.TinkerMystcraft; -import tconstruct.plugins.TinkerThaumcraft; import tconstruct.plugins.imc.TinkerRfTools; import tconstruct.plugins.mfr.TinkerMFR; import tconstruct.plugins.te4.TinkerTE4; @@ -61,51 +61,48 @@ import tconstruct.world.gen.SlimeIslandGen; import tconstruct.world.village.*; -import java.util.Map; -import java.util.Random; - /** * TConstruct, the tool mod. Craft your tools with style, then modify until the * original is gone! - * + * * @author mDiyo */ - -@Mod(modid = TConstruct.modID, name = "TConstruct", version = TConstruct.modVersion, - dependencies = "required-after:Forge@[10.13.3.1384,11.14);" + - "required-after:Mantle@[0.3.2,1.7.10),[1.7.10-0.3.2,);" + //make sure we still have the 0.3.2 requirement, even without the 1.7.10 prefix - "after:MineFactoryReloaded@[1.7.10R2.8.0RC7,);" + - "after:ThermalExpansion@[1.7.10R4.0.0RC2,);" + - "after:ThermalFoundation@[1.7.10R1.0.0RC3,);" + - "after:armourersWorkshop@[1.7.10-0.28.0,);" + - "after:CoFHAPI|energy;" + - "after:CoFHCore;" + - "after:battlegear2;" + - "after:ZeldaItemAPI;" + - "after:DynamicSkillsAPI;" + - "after:NotEnoughItems;" + - "after:Waila;" + - "before:GalacticraftCore;" + - "before:UndergroundBiomes" - ) -public class TConstruct -{ +@Mod( + modid = TConstruct.modID, + name = "TConstruct", + version = TConstruct.modVersion, + dependencies = + "required-after:Forge@[10.13.3.1384,11.14);" + "required-after:Mantle@[0.3.2,1.7.10),[1.7.10-0.3.2,);" + + // make sure we still have the 0.3.2 requirement, even without the 1.7.10 prefix + "after:MineFactoryReloaded@[1.7.10R2.8.0RC7,);" + + "after:ThermalExpansion@[1.7.10R4.0.0RC2,);" + + "after:ThermalFoundation@[1.7.10R1.0.0RC3,);" + + "after:armourersWorkshop@[1.7.10-0.28.0,);" + + "after:CoFHAPI|energy;" + + "after:CoFHCore;" + + "after:battlegear2;" + + "after:ZeldaItemAPI;" + + "after:DynamicSkillsAPI;" + + "after:NotEnoughItems;" + + "after:Waila;" + + "before:GalacticraftCore;" + + "before:UndergroundBiomes") +public class TConstruct { public static final String modVersion = "GRADLETOKEN_VERSION"; /** The value of one ingot in millibuckets */ public static final int ingotLiquidValue = 144; + public static final int oreLiquidValue = ingotLiquidValue * 2; public static final int blockLiquidValue = ingotLiquidValue * 9; public static final int chunkLiquidValue = ingotLiquidValue / 2; public static final int nuggetLiquidValue = ingotLiquidValue / 9; - public static final int stoneLiquidValue = ingotLiquidValue/8; + public static final int stoneLiquidValue = ingotLiquidValue / 8; public static final int liquidUpdateAmount = 6; public static final String modID = "TConstruct"; public static final Logger logger = LogManager.getLogger(modID); public static final PacketPipeline packetPipeline = new PacketPipeline(); public static Random random = new Random(); - - /* Instance of this mod, used for grabbing prototype fields */ @Instance(modID) @@ -115,33 +112,28 @@ public class TConstruct public static TProxyCommon proxy; /* Loads modules in a way that doesn't clutter the @Mod list */ - public static PulseManager pulsar = new PulseManager(modID, new ForgeCFG("TinkersModules", "Modules: Disabling these will disable a chunk of the mod")); + public static PulseManager pulsar = new PulseManager( + modID, new ForgeCFG("TinkersModules", "Modules: Disabling these will disable a chunk of the mod")); - public TConstruct() - { - if (Loader.isModLoaded("Natura")) - { + public TConstruct() { + if (Loader.isModLoaded("Natura")) { logger.info("Natura, what are we going to do tomorrow night?"); LogManager.getLogger("Natura").info("TConstruct, we're going to take over the world!"); - } - else - { + } else { logger.info("Preparing to take over the world"); } EnvironmentChecks.verifyEnvironmentSanity(); } - //Force the client and server to have or not have this mod + // Force the client and server to have or not have this mod @NetworkCheckHandler() - public boolean matchModVersions (Map remoteVersions, Side side) - { + public boolean matchModVersions(Map remoteVersions, Side side) { return remoteVersions.containsKey("TConstruct") && modVersion.equals(remoteVersions.get("TConstruct")); } @EventHandler - public void preInit (FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { PHConstruct.initProps(event.getModConfigurationDirectory()); pulsar.registerPulse(new TinkerWorld()); @@ -179,7 +171,7 @@ public void preInit (FMLPreInitializationEvent event) basinCasting = new LiquidCasting(); chiselDetailing = new Detailing(); - //GameRegistry.registerFuelHandler(content); + // GameRegistry.registerFuelHandler(content); playerTracker = new TPlayerHandler(); // GameRegistry.registerPlayerTracker(playerTracker); @@ -189,22 +181,20 @@ public void preInit (FMLPreInitializationEvent event) pulsar.preInit(event); - if (PHConstruct.achievementsEnabled) - { + if (PHConstruct.achievementsEnabled) { TAchievements.addDefaultAchievements(); } - if (PHConstruct.addToVillages) - { + if (PHConstruct.addToVillages) { // adds to the villager spawner egg VillagerRegistry.instance().registerVillagerId(78943); // moved down, not needed if 'addToVillages' is false - if(PHConstruct.allowVillagerTrading) + if (PHConstruct.allowVillagerTrading) VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades()); VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler()); MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure"); - if(pulsar.isPulseLoaded("Tinkers' Smeltery")) { + if (pulsar.isPulseLoaded("Tinkers' Smeltery")) { VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure"); } @@ -214,12 +204,10 @@ public void preInit (FMLPreInitializationEvent event) } @EventHandler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { packetPipeline.initalise(); - if (event.getSide() == Side.CLIENT) - { - //MinecraftForge.EVENT_BUS.register(new EventCloakRender()); + if (event.getSide() == Side.CLIENT) { + // MinecraftForge.EVENT_BUS.register(new EventCloakRender()); } DimensionBlacklist.getBadBimensions(); @@ -229,8 +217,7 @@ public void init (FMLInitializationEvent event) } @EventHandler - public void postInit (FMLPostInitializationEvent event) - { + public void postInit(FMLPostInitializationEvent event) { packetPipeline.postInitialise(); Behavior.registerBuiltInBehaviors(); SpecialStackHandler.registerBuiltInStackHandlers(); @@ -238,45 +225,39 @@ public void postInit (FMLPostInitializationEvent event) proxy.initialize(); pulsar.postInit(event); - if (PHConstruct.achievementsEnabled) - { + if (PHConstruct.achievementsEnabled) { TAchievements.registerAchievementPane(); MinecraftForge.EVENT_BUS.register(new AchievementEvents()); } } - - /** Called on server shutdown to prevent memory leaks */ - @EventHandler - public void serverStopping(FMLServerStoppingEvent event) { - TinkerGadgets.log.info("Cleaning up SlimeBounceHandler data."); - SlimeBounceHandler.BOUNCING_ENTITIES.clear(); - } + + /** Called on server shutdown to prevent memory leaks */ + @EventHandler + public void serverStopping(FMLServerStoppingEvent event) { + TinkerGadgets.log.info("Cleaning up SlimeBounceHandler data."); + SlimeBounceHandler.BOUNCING_ENTITIES.clear(); + } /* IMC Mod Support */ @EventHandler - public void handleIMC(FMLInterModComms.IMCEvent e) - { + public void handleIMC(FMLInterModComms.IMCEvent e) { IMCHandler.processIMC(e.getMessages()); } @EventHandler - public void loadComplete(FMLLoadCompleteEvent evt) - { + public void loadComplete(FMLLoadCompleteEvent evt) { IMCHandler.processIMC(FMLInterModComms.fetchRuntimeMessages(this)); } - public static LiquidCasting getTableCasting () - { + public static LiquidCasting getTableCasting() { return tableCasting; } - public static LiquidCasting getBasinCasting () - { + public static LiquidCasting getBasinCasting() { return basinCasting; } - public static Detailing getChiselDetailing () - { + public static Detailing getChiselDetailing() { return chiselDetailing; } @@ -288,9 +269,8 @@ public static Detailing getChiselDetailing () @Mod.EventHandler public void missingMapping(FMLMissingMappingsEvent event) { // this will be called because the air-block got removed - for(FMLMissingMappingsEvent.MissingMapping mapping : event.get()) { - if(mapping.name.equals("TConstruct:TankAir")) - mapping.ignore(); + for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) { + if (mapping.name.equals("TConstruct:TankAir")) mapping.ignore(); } } } diff --git a/src/main/java/tconstruct/achievements/AchievementEvents.java b/src/main/java/tconstruct/achievements/AchievementEvents.java index e12cb479d02..074e208488b 100644 --- a/src/main/java/tconstruct/achievements/AchievementEvents.java +++ b/src/main/java/tconstruct/achievements/AchievementEvents.java @@ -14,58 +14,48 @@ import tconstruct.library.tools.*; import tconstruct.tools.logic.ToolForgeLogic; -public class AchievementEvents -{ +public class AchievementEvents { @SubscribeEvent - public void toolCreate (ToolCraftedEvent event) - { - if (event.player != null) - { + public void toolCreate(ToolCraftedEvent event) { + if (event.player != null) { TAchievements.triggerAchievement(event.player, "tconstruct.tinkerer"); - if (event.tool != null && event.tool.getItem() instanceof Weapon) - { + if (event.tool != null && event.tool.getItem() instanceof Weapon) { TAchievements.triggerAchievement(event.player, "tconstruct.preparedFight"); } - if (event.inventory != null && event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0) - { + if (event.inventory != null + && event.inventory instanceof ToolForgeLogic + && event.tool.getItem() instanceof ToolCore + && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0) { TAchievements.triggerAchievement(event.player, "tconstruct.proTinkerer"); } } } @SubscribeEvent - public void entitySlain (LivingDeathEvent event) - { - if (event.source != null && event.source.getEntity() instanceof EntityPlayer) - { + public void entitySlain(LivingDeathEvent event) { + if (event.source != null && event.source.getEntity() instanceof EntityPlayer) { EntityPlayer murderer = (EntityPlayer) event.source.getEntity(); - if (murderer.getHeldItem() != null && murderer.getHeldItem().getItem() instanceof Weapon) - { + if (murderer.getHeldItem() != null && murderer.getHeldItem().getItem() instanceof Weapon) { TAchievements.triggerAchievement(murderer, "tconstruct.enemySlayer"); } } } @SubscribeEvent - public void entityDrops (LivingDropsEvent event) - { - if (event.source.getEntity() instanceof EntityPlayer) - { + public void entityDrops(LivingDropsEvent event) { + if (event.source.getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); - if (player.getHeldItem() != null && player.getHeldItem().getItem() instanceof FryingPan) - { - for (int i = 0; i < event.drops.size(); i++) - { + if (player.getHeldItem() != null && player.getHeldItem().getItem() instanceof FryingPan) { + for (int i = 0; i < event.drops.size(); i++) { ItemStack is = event.drops.get(i).getEntityItem(); - if (FurnaceRecipes.smelting().getSmeltingResult(is) != null && FurnaceRecipes.smelting().getSmeltingResult(is).getItem() instanceof ItemFood) - { + if (FurnaceRecipes.smelting().getSmeltingResult(is) != null + && FurnaceRecipes.smelting().getSmeltingResult(is).getItem() instanceof ItemFood) { NBTTagCompound stackCompound = is.getTagCompound(); - if (stackCompound == null) - { + if (stackCompound == null) { stackCompound = new NBTTagCompound(); } @@ -79,9 +69,12 @@ public void entityDrops (LivingDropsEvent event) @SubscribeEvent public void tooltip(ItemTooltipEvent event) { - if(event.itemStack == null || event.itemStack.getItem() == null || !event.itemStack.hasTagCompound() || !event.itemStack.getTagCompound().hasKey("frypanKill")) - return; + if (event.itemStack == null + || event.itemStack.getItem() == null + || !event.itemStack.hasTagCompound() + || !event.itemStack.getTagCompound().hasKey("frypanKill")) return; - event.toolTip.add("" + ChatFormatting.DARK_PURPLE + ChatFormatting.ITALIC + StatCollector.translateToLocal("frypankill.tooltip")); + event.toolTip.add("" + ChatFormatting.DARK_PURPLE + ChatFormatting.ITALIC + + StatCollector.translateToLocal("frypankill.tooltip")); } } diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java index 4f25f5f4b9d..da14cbdf1c1 100644 --- a/src/main/java/tconstruct/achievements/TAchievements.java +++ b/src/main/java/tconstruct/achievements/TAchievements.java @@ -10,8 +10,7 @@ import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -public class TAchievements -{ +public class TAchievements { private static AchievementPage achievementsPage; private static HashMap achievementsList = new HashMap(); @@ -21,10 +20,8 @@ public class TAchievements * @param name The name of the achievement * @param achievement The achievement */ - public static void addAchievement (String name, Achievement achievement) - { - if (!PHConstruct.achievementsEnabled) - { + public static void addAchievement(String name, Achievement achievement) { + if (!PHConstruct.achievementsEnabled) { return; } @@ -36,8 +33,7 @@ public static void addAchievement (String name, Achievement achievement) * @param name The name of the achievement * @return The achievement */ - public static Achievement getAchievement (String name) - { + public static Achievement getAchievement(String name) { return achievementsList.get(name); } @@ -46,17 +42,14 @@ public static Achievement getAchievement (String name) * @param player The player that earned the achievement * @param name The name of the achievement */ - public static void triggerAchievement (EntityPlayer player, String name) - { - if (!PHConstruct.achievementsEnabled) - { + public static void triggerAchievement(EntityPlayer player, String name) { + if (!PHConstruct.achievementsEnabled) { return; } Achievement ach = getAchievement(name); - if (ach != null) - { + if (ach != null) { player.triggerAchievement(ach); } } @@ -64,38 +57,94 @@ public static void triggerAchievement (EntityPlayer player, String name) /** * Adds all the achievements included in TConstruct, call before registerAchievementPane is called */ - public static void addDefaultAchievements () - { - if (!PHConstruct.achievementsEnabled) - { + public static void addDefaultAchievements() { + if (!PHConstruct.achievementsEnabled) { return; } - addAchievement("tconstruct.beginner", new Achievement("tconstruct.beginner", "tconstruct.beginner", 0, 0, TinkerTools.manualBook, null).initIndependentStat()); - addAchievement("tconstruct.pattern", new Achievement("tconstruct.pattern", "tconstruct.pattern", 2, 1, TinkerTools.blankPattern, getAchievement("tconstruct.beginner"))); - addAchievement("tconstruct.tinkerer", new Achievement("tconstruct.tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TinkerTools.titleIcon, 1, 4096), getAchievement("tconstruct.pattern"))); - addAchievement("tconstruct.preparedFight", new Achievement("tconstruct.preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TinkerTools.titleIcon, 1, 4097), getAchievement("tconstruct.tinkerer"))); - addAchievement("tconstruct.proTinkerer", new Achievement("tconstruct.proTinkerer", "tconstruct.proTinkerer", 4, 3, new ItemStack(TinkerTools.titleIcon, 1, 4098), getAchievement("tconstruct.tinkerer"))); - addAchievement("tconstruct.smelteryMaker", new Achievement("tconstruct.smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TinkerSmeltery.smeltery, getAchievement("tconstruct.beginner"))); - addAchievement("tconstruct.enemySlayer", new Achievement("tconstruct.enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TinkerTools.titleIcon, 1, 4099), getAchievement("tconstruct.preparedFight"))); - addAchievement("tconstruct.dualConvenience", new Achievement("tconstruct.dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TinkerTools.titleIcon, 1, 4100), getAchievement("tconstruct.enemySlayer")).setSpecial()); + addAchievement( + "tconstruct.beginner", + new Achievement("tconstruct.beginner", "tconstruct.beginner", 0, 0, TinkerTools.manualBook, null) + .initIndependentStat()); + addAchievement( + "tconstruct.pattern", + new Achievement( + "tconstruct.pattern", + "tconstruct.pattern", + 2, + 1, + TinkerTools.blankPattern, + getAchievement("tconstruct.beginner"))); + addAchievement( + "tconstruct.tinkerer", + new Achievement( + "tconstruct.tinkerer", + "tconstruct.tinkerer", + 2, + 2, + new ItemStack(TinkerTools.titleIcon, 1, 4096), + getAchievement("tconstruct.pattern"))); + addAchievement( + "tconstruct.preparedFight", + new Achievement( + "tconstruct.preparedFight", + "tconstruct.preparedFight", + 1, + 3, + new ItemStack(TinkerTools.titleIcon, 1, 4097), + getAchievement("tconstruct.tinkerer"))); + addAchievement( + "tconstruct.proTinkerer", + new Achievement( + "tconstruct.proTinkerer", + "tconstruct.proTinkerer", + 4, + 3, + new ItemStack(TinkerTools.titleIcon, 1, 4098), + getAchievement("tconstruct.tinkerer"))); + addAchievement( + "tconstruct.smelteryMaker", + new Achievement( + "tconstruct.smelteryMaker", + "tconstruct.smelteryMaker", + -2, + -1, + TinkerSmeltery.smeltery, + getAchievement("tconstruct.beginner"))); + addAchievement( + "tconstruct.enemySlayer", + new Achievement( + "tconstruct.enemySlayer", + "tconstruct.enemySlayer", + 0, + 5, + new ItemStack(TinkerTools.titleIcon, 1, 4099), + getAchievement("tconstruct.preparedFight"))); + addAchievement( + "tconstruct.dualConvenience", + new Achievement( + "tconstruct.dualConvenience", + "tconstruct.dualConvenience", + 0, + 7, + new ItemStack(TinkerTools.titleIcon, 1, 4100), + getAchievement("tconstruct.enemySlayer")) + .setSpecial()); } /** * Should be called after all the achievements are loaded (PostInit would be good) */ - public static void registerAchievementPane () - { - if (!PHConstruct.achievementsEnabled) - { + public static void registerAchievementPane() { + if (!PHConstruct.achievementsEnabled) { return; } Achievement[] achievements = new Achievement[achievementsList.size()]; achievements = achievementsList.values().toArray(achievements); - achievementsPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achievements); + achievementsPage = + new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achievements); AchievementPage.registerAchievementPage(achievementsPage); } - } diff --git a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java index 2e6abddd021..7b1e258ec5b 100644 --- a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java +++ b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java @@ -7,22 +7,24 @@ import net.minecraft.world.World; import tconstruct.achievements.TAchievements; -public class CraftAchievementItem extends CraftingItem -{ +public class CraftAchievementItem extends CraftingItem { public String grantedAchievement = ""; - public CraftAchievementItem(String[] names, String[] tex, String folder, String modTexturePrefix, CreativeTabs tab, String tachievement) - { + public CraftAchievementItem( + String[] names, + String[] tex, + String folder, + String modTexturePrefix, + CreativeTabs tab, + String tachievement) { super(names, tex, folder, modTexturePrefix, tab); grantedAchievement = tachievement; } @Override - public void onCreated (ItemStack item, World world, EntityPlayer player) - { - if (grantedAchievement != null && !grantedAchievement.equals("")) - { + public void onCreated(ItemStack item, World world, EntityPlayer player) { + if (grantedAchievement != null && !grantedAchievement.equals("")) { TAchievements.triggerAchievement(player, grantedAchievement); } } diff --git a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java index 5ec58560cba..c2658f5797d 100644 --- a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java +++ b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java @@ -3,9 +3,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -public interface IPlayerExtendedInventoryWrapper -{ - public IInventory getKnapsackInventory (EntityPlayer player); +public interface IPlayerExtendedInventoryWrapper { + public IInventory getKnapsackInventory(EntityPlayer player); - public IInventory getAccessoryInventory (EntityPlayer player); + public IInventory getAccessoryInventory(EntityPlayer player); } diff --git a/src/main/java/tconstruct/api/TConstructAPI.java b/src/main/java/tconstruct/api/TConstructAPI.java index 98cfb46f7ef..a7c0793aa38 100644 --- a/src/main/java/tconstruct/api/TConstructAPI.java +++ b/src/main/java/tconstruct/api/TConstructAPI.java @@ -2,12 +2,10 @@ import net.minecraft.entity.player.EntityPlayer; -public class TConstructAPI -{ +public class TConstructAPI { public static String PROP_NAME; - public static IPlayerExtendedInventoryWrapper getInventoryWrapper (EntityPlayer player) - { + public static IPlayerExtendedInventoryWrapper getInventoryWrapper(EntityPlayer player) { return (IPlayerExtendedInventoryWrapper) player.getExtendedProperties(PROP_NAME); } } diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java index a814cd018f2..8c4f3e4f960 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilities.java +++ b/src/main/java/tconstruct/armor/ArmorAbilities.java @@ -1,8 +1,10 @@ package tconstruct.armor; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -12,51 +14,42 @@ import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.util.network.HealthUpdatePacket; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -public class ArmorAbilities -{ +public class ArmorAbilities { public static List stepBoostedPlayers = new ArrayList(); - //ItemStack prevFeet; + // ItemStack prevFeet; double prevMotionY; @SubscribeEvent - public void playerTick (TickEvent.PlayerTickEvent event) - { + public void playerTick(TickEvent.PlayerTickEvent event) { EntityPlayer player = event.player; TPlayerStats stats = TPlayerStats.get(player); // Wall climb - if (stats.climbWalls) - { + if (stats.climbWalls) { double motionX = player.posX - player.lastTickPosX; double motionZ = player.posZ - player.lastTickPosZ; double motionY = player.posY - player.lastTickPosY - 0.762; - if (motionY > 0.0D && (motionX == 0D || motionZ == 0D)) - { + if (motionY > 0.0D && (motionX == 0D || motionZ == 0D)) { player.fallDistance = 0.0F; } } - //Feet changes + // Feet changes ItemStack feet = player.getCurrentArmor(0); - if (feet != null && feet.hasTagCompound()) - { - if (feet.getItem() instanceof IModifyable && !player.isSneaking()) - { - NBTTagCompound tag = feet.getTagCompound().getCompoundTag(((IModifyable) feet.getItem()).getBaseTagName()); + if (feet != null && feet.hasTagCompound()) { + if (feet.getItem() instanceof IModifyable && !player.isSneaking()) { + NBTTagCompound tag = + feet.getTagCompound().getCompoundTag(((IModifyable) feet.getItem()).getBaseTagName()); int sole = tag.getInteger("Slimy Soles"); - if (sole > 0) - { + if (sole > 0) { if (!player.isSneaking() && player.onGround && prevMotionY < -0.4) player.motionY = -prevMotionY * (Math.min(0.99, sole * 0.2)); } } prevMotionY = player.motionY; } - /* Former step height boost handling + /* Former step height boost handling if (feet != prevFeet) { if (prevFeet != null && prevFeet.getItem() instanceof TravelGear) @@ -65,19 +58,16 @@ public void playerTick (TickEvent.PlayerTickEvent event) player.stepHeight += 0.6f; prevFeet = feet; }*/ - boolean stepBoosted = stepBoostedPlayers.contains(player.getGameProfile().getName()); - if (stepBoosted) - player.stepHeight = 1.1f; - if (!stepBoosted && feet != null && feet.getItem() instanceof TravelGear) - { + boolean stepBoosted = + stepBoostedPlayers.contains(player.getGameProfile().getName()); + if (stepBoosted) player.stepHeight = 1.1f; + if (!stepBoosted && feet != null && feet.getItem() instanceof TravelGear) { stepBoostedPlayers.add(player.getGameProfile().getName()); - } - else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear))) - { + } else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear))) { stepBoostedPlayers.remove(player.getGameProfile().getName()); player.stepHeight -= 0.6f; } - //TODO: Proper minimap support + // TODO: Proper minimap support /*ItemStack stack = player.inventory.getStackInSlot(8); if (stack != null && stack.getItem() instanceof ItemMap) { @@ -85,16 +75,14 @@ else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear) }*/ } - @SubscribeEvent - public void dimensionChanged(PlayerEvent.PlayerChangedDimensionEvent event) - { - if(event.player == null || !(event.player instanceof EntityPlayerMP)) - return; + public void dimensionChanged(PlayerEvent.PlayerChangedDimensionEvent event) { + if (event.player == null || !(event.player instanceof EntityPlayerMP)) return; // this callback is only called serverside float oldHealth = event.player.getHealth(); // tell the client to update its hp - TConstruct.packetPipeline.sendTo(new HealthUpdatePacket(oldHealth), (net.minecraft.entity.player.EntityPlayerMP) event.player); + TConstruct.packetPipeline.sendTo( + new HealthUpdatePacket(oldHealth), (net.minecraft.entity.player.EntityPlayerMP) event.player); } } diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 873a546e136..9e1dd8c544c 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -3,6 +3,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.util.Random; import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -51,489 +52,512 @@ import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import java.util.Random; - public class ArmorProxyClient extends ArmorProxyCommon { - public static WingModel wings = new WingModel(); - public static BootBump bootbump = new BootBump(); - public static HiddenPlayerModel glove = new HiddenPlayerModel(0.25F, 4); - public static HiddenPlayerModel vest = new HiddenPlayerModel(0.25f, 1); - public static BeltModel belt = new BeltModel(); - - public static TPlayerStats playerStats = new TPlayerStats(); - - public static KnapsackInventory knapsack = new KnapsackInventory(); - public static ArmorExtended armorExtended = new ArmorExtended(); - - @Override - public void preInit() { - controlInstance = new ArmorControls(); - FMLCommonHandler.instance().bus().register(controlInstance); - MinecraftForge.EVENT_BUS.register(controlInstance); - MinecraftForge.EVENT_BUS.register(new TabRegistry()); - } - - @Override - public void initialize() { - registerGuiHandler(); - registerKeys(); - registerManualIcons(); - registerManualRecipes(); - MinecraftForge.EVENT_BUS.register(this); - } - - private void registerManualIcons() { - MantleClientRegistry - .registerManualIcon("travelgoggles", TinkerArmor.travelGoggles.getDefaultItem()); - MantleClientRegistry - .registerManualIcon("travelvest", TinkerArmor.travelVest.getDefaultItem()); - MantleClientRegistry - .registerManualIcon("travelwings", TinkerArmor.travelWings.getDefaultItem()); - MantleClientRegistry - .registerManualIcon("travelboots", TinkerArmor.travelBoots.getDefaultItem()); - MantleClientRegistry - .registerManualIcon("travelbelt", TinkerArmor.travelBelt.getDefaultItem()); - MantleClientRegistry - .registerManualIcon("travelglove", TinkerArmor.travelGlove.getDefaultItem()); - } - - private void registerManualRecipes() { - ItemStack feather = new ItemStack(Items.feather); - ItemStack redstone = new ItemStack(Items.redstone); - ItemStack goggles = TinkerArmor.travelGoggles.getDefaultItem(); - - TConstructClientRegistry.registerManualModifier("nightvision", goggles.copy(), - new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 8198), - new ItemStack(Items.golden_carrot), null); - - ItemStack vest = TinkerArmor.travelVest.getDefaultItem(); - TConstructClientRegistry - .registerManualModifier("dodge", vest.copy(), new ItemStack(Items.ender_eye), - new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar), null); - TConstructClientRegistry.registerManualModifier("stealth", vest.copy(), - new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), - new ItemStack(Items.potionitem, 1, 8206), new ItemStack(Items.golden_carrot)); - - ItemStack wings = TinkerArmor.travelWings.getDefaultItem(); - TConstructClientRegistry.registerManualModifier("doublejumpwings", wings.copy(), - new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), - new ItemStack(Blocks.piston), null); - - ItemStack[] recipe = new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 0), - new ItemStack(Items.ender_pearl), feather, feather, feather, feather, feather, - feather - }; - ItemStack modWings = ModifyBuilder.instance.modifyItem(wings, recipe); - MantleClientRegistry.registerManualLargeRecipe("featherfall", modWings.copy(), feather, - new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, wings.copy(), feather, - feather, new ItemStack(Items.ender_pearl), feather); - - ItemStack boots = TinkerArmor.travelBoots.getDefaultItem(); - TConstructClientRegistry.registerManualModifier("doublejumpboots", boots.copy(), - new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), - new ItemStack(Blocks.piston), null); - TConstructClientRegistry - .registerManualModifier("waterwalk", boots.copy(), new ItemStack(Blocks.waterlily), - new ItemStack(Blocks.waterlily)); - TConstructClientRegistry.registerManualModifier("leadboots", boots.copy(), - new ItemStack(Blocks.iron_block)); - TConstructClientRegistry.registerManualModifier("slimysoles", boots.copy(), - new ItemStack(TinkerWorld.slimePad, 1, 0), - new ItemStack(TinkerWorld.slimePad, 1, 0)); - - ItemStack gloves = TinkerArmor.travelGlove.getDefaultItem(); - TConstructClientRegistry.registerManualModifier("glovehaste", gloves.copy(), redstone, - new ItemStack(Blocks.redstone_block)); - //MantleClientRegistry.registerManualSmallRecipe("gloveclimb", gloves.copy(), new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25), null); - TConstructClientRegistry - .registerManualModifier("gloveknuckles", gloves.copy(), new ItemStack(Items.quartz), - new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)); - - // moss - ItemStack moss = new ItemStack(TinkerTools.materials, 1, 6); - TConstructClientRegistry.registerManualModifier("mossgoggles", goggles.copy(), moss.copy()); - TConstructClientRegistry.registerManualModifier("mossvest", vest.copy(), moss.copy()); - TConstructClientRegistry.registerManualModifier("mosswings", wings.copy(), moss.copy()); - TConstructClientRegistry.registerManualModifier("mossboots", boots.copy(), moss.copy()); - } - - @Override - protected void registerGuiHandler() { - super.registerGuiHandler(); - TProxyCommon.registerClientGuiHandler(inventoryGui, this); - TProxyCommon.registerClientGuiHandler(armorGuiID, this); - TProxyCommon.registerClientGuiHandler(knapsackGuiID, this); - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, - int z) { - if (ID == ArmorProxyCommon.inventoryGui) { - GuiInventory inventory = new GuiInventory(player); - return inventory; - } - if (ID == ArmorProxyCommon.armorGuiID) { - ArmorProxyClient.armorExtended.init(Minecraft.getMinecraft().thePlayer); - return new ArmorExtendedGui(player.inventory, ArmorProxyClient.armorExtended); - } - if (ID == ArmorProxyCommon.knapsackGuiID) { - ArmorProxyClient.knapsack.init(Minecraft.getMinecraft().thePlayer); - return new KnapsackGui(player.inventory, ArmorProxyClient.knapsack); - } - return null; - } - - @Override - public void registerTickHandler() { - FMLCommonHandler.instance().bus().register(new ArmorTickHandler()); - } - - /* Keybindings */ - public static ArmorControls controlInstance; - - @Override - public void registerKeys() { - controlInstance.registerKeys(); - - TabRegistry.registerTab(new InventoryTabVanilla()); - TabRegistry.registerTab(new InventoryTabArmorExtended()); - TabRegistry.registerTab(new InventoryTabKnapsack()); - } - - Minecraft mc = Minecraft.getMinecraft(); - - private static final ResourceLocation hearts = new ResourceLocation("tinker", - "textures/gui/newhearts.png"); - private static final ResourceLocation icons = new ResourceLocation("textures/gui/icons.png"); - // public static int left_height = 39; - // public static int right_height = 39; - Random rand = new Random(); - int updateCounter = 0; - - GameSettings gs = Minecraft.getMinecraft().gameSettings; - - @SubscribeEvent - public void goggleZoom(FOVUpdateEvent event) { - if (ArmorControls.zoom) { - ItemStack helmet = event.entity.getCurrentArmor(3); - if (helmet != null && helmet.getItem() instanceof TravelGear) { - event.newfov = 0.3f; - } - } - //ItemStack feet = player.getCurrentArmor(0); - //event.newfov = 1.0f; - } - - /* HUD */ - @SubscribeEvent - public void renderHealthbar(RenderGameOverlayEvent.Pre event) { - if (Loader.isModLoaded( - "rpghud")) // uses different display, displays health correctly by itself. - return; - - if (!Loader.isModLoaded("tukmc_Vz") || Loader - .isModLoaded("borderlands"))// Loader check to avoid conflicting - // with a GUI mod (thanks Vazkii!) - { - if (event.type == ElementType.HEALTH) { - updateCounter++; - - ScaledResolution scaledresolution = new ScaledResolution(this.mc, - this.mc.displayWidth, this.mc.displayHeight); - int scaledWidth = scaledresolution.getScaledWidth(); - int scaledHeight = scaledresolution.getScaledHeight(); - int xBasePos = scaledWidth / 2 - 91; - int yBasePos = scaledHeight - 39; - - boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1; - - if (mc.thePlayer.hurtResistantTime < 10) { - highlight = false; - } - - IAttributeInstance attrMaxHealth = this.mc.thePlayer - .getEntityAttribute(SharedMonsterAttributes.maxHealth); - int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth()); - int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); - float healthMax = (float) attrMaxHealth.getAttributeValue(); - if (healthMax > 20) - healthMax = 20; - float absorb = this.mc.thePlayer.getAbsorptionAmount(); - - int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); - int rowHeight = Math.max(10 - (healthRows - 2), 3); - - this.rand.setSeed((long) (updateCounter * 312871)); - - int left = scaledWidth / 2 - 91; - int top = scaledHeight - GuiIngameForge.left_height; - - if (!GuiIngameForge.renderExperiance) { - top += 7; - yBasePos += 7; - } - - int regen = -1; - if (mc.thePlayer.isPotionActive(Potion.regeneration)) { - regen = updateCounter % 25; - } - - final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); - final int BACKGROUND = (highlight ? 25 : 16); - int MARGIN = 16; - if (mc.thePlayer.isPotionActive(Potion.poison)) - MARGIN += 36; - else if (mc.thePlayer.isPotionActive(Potion.wither)) - MARGIN += 72; - float absorbRemaining = absorb; - - for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; - i >= 0; --i) { - int b0 = (highlight ? 1 : 0); - int row = MathHelper.ceiling_float_int((float) (i + 1) / 10.0F) - 1; - int x = left + i % 10 * 8; - int y = top - row * rowHeight; - - if (health <= 4) - y += rand.nextInt(2); - if (i == regen) - y -= 2; - - drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); - - if (highlight) { - if (i * 2 + 1 < healthLast) - drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); // 6 - else if (i * 2 + 1 == healthLast) - drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); // 7 - } - - if (absorbRemaining > 0.0F) { - if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) - drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); // 17 - else - drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); // 16 - absorbRemaining -= 2.0F; - } - else { - if (i * 2 + 1 < health) - drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); // 4 - else if (i * 2 + 1 == health) - drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); // 5 - } - } - - int potionOffset = 0; - PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); - if (potion != null) - potionOffset = 18; - potion = mc.thePlayer.getActivePotionEffect(Potion.poison); - if (potion != null) - potionOffset = 9; - if (mc.theWorld.getWorldInfo().isHardcoreModeEnabled()) - potionOffset += 27; - - // Extra hearts - this.mc.getTextureManager().bindTexture(hearts); - - int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); - for (int iter = 0; iter < hp / 20; iter++) { - int renderHearts = (hp - 20 * (iter + 1)) / 2; - if (renderHearts > 10) - renderHearts = 10; - for (int i = 0; i < renderHearts; i++) { - int y = 0; - if (i == regen) - y -= 2; - this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos + y, 0 + 18 * iter, - potionOffset, 9, 9); - } - if (hp % 2 == 1 && renderHearts < 10) { - this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, - 9 + 18 * iter, potionOffset, 9, 9); - } - } - - this.mc.getTextureManager().bindTexture(icons); - GuiIngameForge.left_height += 10; - if (absorb > 0) - GuiIngameForge.left_height += 10; - - event.setCanceled(true); - if (event.type == ElementType.CROSSHAIRS && gs.thirdPersonView != 0) { - event.setCanceled(true); - } - } - } - } - - public void drawTexturedModalRect(int par1, int par2, int par3, int par4, int par5, int par6) { - float f = 0.00390625F; - float f1 = 0.00390625F; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator - .addVertexWithUV((double) (par1 + 0), (double) (par2 + par6), (double) this.zLevel, - (double) ((float) (par3 + 0) * f), (double) ((float) (par4 + par6) * f1)); - tessellator.addVertexWithUV((double) (par1 + par5), (double) (par2 + par6), - (double) this.zLevel, (double) ((float) (par3 + par5) * f), - (double) ((float) (par4 + par6) * f1)); - tessellator - .addVertexWithUV((double) (par1 + par5), (double) (par2 + 0), (double) this.zLevel, - (double) ((float) (par3 + par5) * f), (double) ((float) (par4 + 0) * f1)); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, - (double) ((float) (par3 + 0) * f), (double) ((float) (par4 + 0) * f1)); - tessellator.draw(); - } - - double zLevel = 0; - - /* Armor rendering */ - @SubscribeEvent - public void adjustArmor(RenderPlayerEvent.SetArmorModel event) { - switch (event.slot) { - case 1: - ArmorProxyClient.vest.onGround = event.renderer.modelBipedMain.onGround; - ArmorProxyClient.vest.isRiding = event.renderer.modelBipedMain.isRiding; - ArmorProxyClient.vest.isChild = event.renderer.modelBipedMain.isChild; - ArmorProxyClient.vest.isSneak = event.renderer.modelBipedMain.isSneak; - case 2: - ArmorProxyClient.wings.onGround = event.renderer.modelBipedMain.onGround; - ArmorProxyClient.wings.isRiding = event.renderer.modelBipedMain.isRiding; - ArmorProxyClient.wings.isChild = event.renderer.modelBipedMain.isChild; - ArmorProxyClient.wings.isSneak = event.renderer.modelBipedMain.isSneak; - - ArmorProxyClient.glove.onGround = event.renderer.modelBipedMain.onGround; - ArmorProxyClient.glove.isRiding = event.renderer.modelBipedMain.isRiding; - ArmorProxyClient.glove.isChild = event.renderer.modelBipedMain.isChild; - ArmorProxyClient.glove.isSneak = event.renderer.modelBipedMain.isSneak; - ArmorProxyClient.glove.heldItemLeft = event.renderer.modelBipedMain.heldItemLeft; - ArmorProxyClient.glove.heldItemRight = event.renderer.modelBipedMain.heldItemRight; - - ArmorProxyClient.belt.onGround = event.renderer.modelBipedMain.onGround; - ArmorProxyClient.belt.isRiding = event.renderer.modelBipedMain.isRiding; - ArmorProxyClient.belt.isChild = event.renderer.modelBipedMain.isChild; - ArmorProxyClient.belt.isSneak = event.renderer.modelBipedMain.isSneak; - - renderArmorExtras(event); - - break; - case 3: - ArmorProxyClient.bootbump.onGround = event.renderer.modelBipedMain.onGround; - ArmorProxyClient.bootbump.isRiding = event.renderer.modelBipedMain.isRiding; - ArmorProxyClient.bootbump.isChild = event.renderer.modelBipedMain.isChild; - ArmorProxyClient.bootbump.isSneak = event.renderer.modelBipedMain.isSneak; - break; - } - } - - void renderArmorExtras(RenderPlayerEvent.SetArmorModel event) { - float partialTick = event.partialRenderTick; - - EntityPlayer player = event.entityPlayer; - - // todo: synchronize extra armor with other clients. Until then, only draw locally - if (player != Minecraft.getMinecraft().thePlayer) - return; - - float posX = (float) (player.lastTickPosX - + (player.posX - player.lastTickPosX) * partialTick); - float posY = (float) (player.lastTickPosY - + (player.posY - player.lastTickPosY) * partialTick); - float posZ = (float) (player.lastTickPosZ - + (player.posZ - player.lastTickPosZ) * partialTick); - - float yawOffset = this - .interpolateRotation(player.prevRenderYawOffset, player.renderYawOffset, - partialTick); - float yawRotation = this - .interpolateRotation(player.prevRotationYawHead, player.rotationYawHead, - partialTick); - float pitch; - final float zeropointsixtwofive = 0.0625F; - - if (player.isRiding() && player.ridingEntity instanceof EntityLivingBase) { - EntityLivingBase entitylivingbase1 = (EntityLivingBase) player.ridingEntity; - yawOffset = this.interpolateRotation(entitylivingbase1.prevRenderYawOffset, - entitylivingbase1.renderYawOffset, partialTick); - pitch = MathHelper.wrapAngleTo180_float(yawRotation - yawOffset); - - if (pitch < -85.0F) { - pitch = -85.0F; - } - - if (pitch >= 85.0F) { - pitch = 85.0F; - } - - yawOffset = yawRotation - pitch; - - if (pitch * pitch > 2500.0F) { - yawOffset += pitch * 0.2F; - } - } - - pitch = this.handleRotationFloat(player, partialTick); - float bodyRotation = player.prevRotationPitch - + (player.rotationPitch - player.prevRotationPitch) * partialTick; - float limbSwing = player.prevLimbSwingAmount - + (player.limbSwingAmount - player.prevLimbSwingAmount) * partialTick; - float limbSwingMod = player.limbSwing - player.limbSwingAmount * (1.0F - partialTick); - //TPlayerStats stats = TPlayerStats.get(player); - ArmorExtended armor = ArmorProxyClient.armorExtended; //TODO: Do this for every player, not just the client - if (armor != null && armor.inventory[1] != null) { - Item item = armor.inventory[1].getItem(); - ModelBiped model = item.getArmorModel(player, armor.inventory[1], 4); - - if (item instanceof IAccessoryModel) { - this.mc.getTextureManager().bindTexture( - ((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1)); - model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick); - model.render(player, limbSwingMod, limbSwing, pitch, yawRotation - yawOffset, - bodyRotation, zeropointsixtwofive); - } - } - - if (armor != null && armor.inventory[3] != null) { - Item item = armor.inventory[3].getItem(); - ModelBiped model = item.getArmorModel(player, armor.inventory[3], 5); - - if (item instanceof IAccessoryModel) { - this.mc.getTextureManager().bindTexture( - ((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1)); - model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick); - model.render(player, limbSwingMod, limbSwing, pitch, yawRotation - yawOffset, - bodyRotation, zeropointsixtwofive); - } - } - } - - private float interpolateRotation(float par1, float par2, float par3) { - float f3; - - for (f3 = par2 - par1; f3 < -180.0F; f3 += 360.0F) { - ; - } - - while (f3 >= 180.0F) { - f3 -= 360.0F; - } - - return par1 + par3 * f3; - } - - protected float handleRotationFloat(EntityLivingBase par1EntityLivingBase, float par2) { - return (float) par1EntityLivingBase.ticksExisted + par2; - } - - @Override - public void updatePlayerStats (TPlayerStats stats) - { - - playerStats.copyFrom(stats, false); - armorExtended = stats.armor; - knapsack = stats.knapsack; - //dumpTPlayerStats(stats); - } - + public static WingModel wings = new WingModel(); + public static BootBump bootbump = new BootBump(); + public static HiddenPlayerModel glove = new HiddenPlayerModel(0.25F, 4); + public static HiddenPlayerModel vest = new HiddenPlayerModel(0.25f, 1); + public static BeltModel belt = new BeltModel(); + + public static TPlayerStats playerStats = new TPlayerStats(); + + public static KnapsackInventory knapsack = new KnapsackInventory(); + public static ArmorExtended armorExtended = new ArmorExtended(); + + @Override + public void preInit() { + controlInstance = new ArmorControls(); + FMLCommonHandler.instance().bus().register(controlInstance); + MinecraftForge.EVENT_BUS.register(controlInstance); + MinecraftForge.EVENT_BUS.register(new TabRegistry()); + } + + @Override + public void initialize() { + registerGuiHandler(); + registerKeys(); + registerManualIcons(); + registerManualRecipes(); + MinecraftForge.EVENT_BUS.register(this); + } + + private void registerManualIcons() { + MantleClientRegistry.registerManualIcon("travelgoggles", TinkerArmor.travelGoggles.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelvest", TinkerArmor.travelVest.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelwings", TinkerArmor.travelWings.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelboots", TinkerArmor.travelBoots.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelbelt", TinkerArmor.travelBelt.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelglove", TinkerArmor.travelGlove.getDefaultItem()); + } + + private void registerManualRecipes() { + ItemStack feather = new ItemStack(Items.feather); + ItemStack redstone = new ItemStack(Items.redstone); + ItemStack goggles = TinkerArmor.travelGoggles.getDefaultItem(); + + TConstructClientRegistry.registerManualModifier( + "nightvision", + goggles.copy(), + new ItemStack(Items.flint_and_steel), + new ItemStack(Items.potionitem, 1, 8198), + new ItemStack(Items.golden_carrot), + null); + + ItemStack vest = TinkerArmor.travelVest.getDefaultItem(); + TConstructClientRegistry.registerManualModifier( + "dodge", + vest.copy(), + new ItemStack(Items.ender_eye), + new ItemStack(Items.ender_pearl), + new ItemStack(Items.sugar), + null); + TConstructClientRegistry.registerManualModifier( + "stealth", + vest.copy(), + new ItemStack(Items.fermented_spider_eye), + new ItemStack(Items.ender_eye), + new ItemStack(Items.potionitem, 1, 8206), + new ItemStack(Items.golden_carrot)); + + ItemStack wings = TinkerArmor.travelWings.getDefaultItem(); + TConstructClientRegistry.registerManualModifier( + "doublejumpwings", + wings.copy(), + new ItemStack(Items.ghast_tear), + new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Blocks.piston), + null); + + ItemStack[] recipe = new ItemStack[] { + new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Items.ender_pearl), + feather, + feather, + feather, + feather, + feather, + feather + }; + ItemStack modWings = ModifyBuilder.instance.modifyItem(wings, recipe); + MantleClientRegistry.registerManualLargeRecipe( + "featherfall", + modWings.copy(), + feather, + new ItemStack(TinkerWorld.slimeGel, 1, 0), + feather, + feather, + wings.copy(), + feather, + feather, + new ItemStack(Items.ender_pearl), + feather); + + ItemStack boots = TinkerArmor.travelBoots.getDefaultItem(); + TConstructClientRegistry.registerManualModifier( + "doublejumpboots", + boots.copy(), + new ItemStack(Items.ghast_tear), + new ItemStack(TinkerWorld.slimeGel, 1, 1), + new ItemStack(Blocks.piston), + null); + TConstructClientRegistry.registerManualModifier( + "waterwalk", boots.copy(), new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily)); + TConstructClientRegistry.registerManualModifier("leadboots", boots.copy(), new ItemStack(Blocks.iron_block)); + TConstructClientRegistry.registerManualModifier( + "slimysoles", + boots.copy(), + new ItemStack(TinkerWorld.slimePad, 1, 0), + new ItemStack(TinkerWorld.slimePad, 1, 0)); + + ItemStack gloves = TinkerArmor.travelGlove.getDefaultItem(); + TConstructClientRegistry.registerManualModifier( + "glovehaste", gloves.copy(), redstone, new ItemStack(Blocks.redstone_block)); + // MantleClientRegistry.registerManualSmallRecipe("gloveclimb", gloves.copy(), new ItemStack(Items.slime_ball), + // new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25), null); + TConstructClientRegistry.registerManualModifier( + "gloveknuckles", + gloves.copy(), + new ItemStack(Items.quartz), + new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)); + + // moss + ItemStack moss = new ItemStack(TinkerTools.materials, 1, 6); + TConstructClientRegistry.registerManualModifier("mossgoggles", goggles.copy(), moss.copy()); + TConstructClientRegistry.registerManualModifier("mossvest", vest.copy(), moss.copy()); + TConstructClientRegistry.registerManualModifier("mosswings", wings.copy(), moss.copy()); + TConstructClientRegistry.registerManualModifier("mossboots", boots.copy(), moss.copy()); + } + + @Override + protected void registerGuiHandler() { + super.registerGuiHandler(); + TProxyCommon.registerClientGuiHandler(inventoryGui, this); + TProxyCommon.registerClientGuiHandler(armorGuiID, this); + TProxyCommon.registerClientGuiHandler(knapsackGuiID, this); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + if (ID == ArmorProxyCommon.inventoryGui) { + GuiInventory inventory = new GuiInventory(player); + return inventory; + } + if (ID == ArmorProxyCommon.armorGuiID) { + ArmorProxyClient.armorExtended.init(Minecraft.getMinecraft().thePlayer); + return new ArmorExtendedGui(player.inventory, ArmorProxyClient.armorExtended); + } + if (ID == ArmorProxyCommon.knapsackGuiID) { + ArmorProxyClient.knapsack.init(Minecraft.getMinecraft().thePlayer); + return new KnapsackGui(player.inventory, ArmorProxyClient.knapsack); + } + return null; + } + + @Override + public void registerTickHandler() { + FMLCommonHandler.instance().bus().register(new ArmorTickHandler()); + } + + /* Keybindings */ + public static ArmorControls controlInstance; + + @Override + public void registerKeys() { + controlInstance.registerKeys(); + + TabRegistry.registerTab(new InventoryTabVanilla()); + TabRegistry.registerTab(new InventoryTabArmorExtended()); + TabRegistry.registerTab(new InventoryTabKnapsack()); + } + + Minecraft mc = Minecraft.getMinecraft(); + + private static final ResourceLocation hearts = new ResourceLocation("tinker", "textures/gui/newhearts.png"); + private static final ResourceLocation icons = new ResourceLocation("textures/gui/icons.png"); + // public static int left_height = 39; + // public static int right_height = 39; + Random rand = new Random(); + int updateCounter = 0; + + GameSettings gs = Minecraft.getMinecraft().gameSettings; + + @SubscribeEvent + public void goggleZoom(FOVUpdateEvent event) { + if (ArmorControls.zoom) { + ItemStack helmet = event.entity.getCurrentArmor(3); + if (helmet != null && helmet.getItem() instanceof TravelGear) { + event.newfov = 0.3f; + } + } + // ItemStack feet = player.getCurrentArmor(0); + // event.newfov = 1.0f; + } + + /* HUD */ + @SubscribeEvent + public void renderHealthbar(RenderGameOverlayEvent.Pre event) { + if (Loader.isModLoaded("rpghud")) // uses different display, displays health correctly by itself. + return; + + if (!Loader.isModLoaded("tukmc_Vz") || Loader.isModLoaded("borderlands")) // Loader check to avoid conflicting + // with a GUI mod (thanks Vazkii!) + { + if (event.type == ElementType.HEALTH) { + updateCounter++; + + ScaledResolution scaledresolution = + new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight); + int scaledWidth = scaledresolution.getScaledWidth(); + int scaledHeight = scaledresolution.getScaledHeight(); + int xBasePos = scaledWidth / 2 - 91; + int yBasePos = scaledHeight - 39; + + boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1; + + if (mc.thePlayer.hurtResistantTime < 10) { + highlight = false; + } + + IAttributeInstance attrMaxHealth = + this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth); + int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth()); + int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); + float healthMax = (float) attrMaxHealth.getAttributeValue(); + if (healthMax > 20) healthMax = 20; + float absorb = this.mc.thePlayer.getAbsorptionAmount(); + + int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); + int rowHeight = Math.max(10 - (healthRows - 2), 3); + + this.rand.setSeed((long) (updateCounter * 312871)); + + int left = scaledWidth / 2 - 91; + int top = scaledHeight - GuiIngameForge.left_height; + + if (!GuiIngameForge.renderExperiance) { + top += 7; + yBasePos += 7; + } + + int regen = -1; + if (mc.thePlayer.isPotionActive(Potion.regeneration)) { + regen = updateCounter % 25; + } + + final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int BACKGROUND = (highlight ? 25 : 16); + int MARGIN = 16; + if (mc.thePlayer.isPotionActive(Potion.poison)) MARGIN += 36; + else if (mc.thePlayer.isPotionActive(Potion.wither)) MARGIN += 72; + float absorbRemaining = absorb; + + for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) { + int b0 = (highlight ? 1 : 0); + int row = MathHelper.ceiling_float_int((float) (i + 1) / 10.0F) - 1; + int x = left + i % 10 * 8; + int y = top - row * rowHeight; + + if (health <= 4) y += rand.nextInt(2); + if (i == regen) y -= 2; + + drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); + + if (highlight) { + if (i * 2 + 1 < healthLast) drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); // 6 + else if (i * 2 + 1 == healthLast) drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); // 7 + } + + if (absorbRemaining > 0.0F) { + if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) + drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); // 17 + else drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); // 16 + absorbRemaining -= 2.0F; + } else { + if (i * 2 + 1 < health) drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); // 4 + else if (i * 2 + 1 == health) drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); // 5 + } + } + + int potionOffset = 0; + PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); + if (potion != null) potionOffset = 18; + potion = mc.thePlayer.getActivePotionEffect(Potion.poison); + if (potion != null) potionOffset = 9; + if (mc.theWorld.getWorldInfo().isHardcoreModeEnabled()) potionOffset += 27; + + // Extra hearts + this.mc.getTextureManager().bindTexture(hearts); + + int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); + for (int iter = 0; iter < hp / 20; iter++) { + int renderHearts = (hp - 20 * (iter + 1)) / 2; + if (renderHearts > 10) renderHearts = 10; + for (int i = 0; i < renderHearts; i++) { + int y = 0; + if (i == regen) y -= 2; + this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos + y, 0 + 18 * iter, potionOffset, 9, 9); + } + if (hp % 2 == 1 && renderHearts < 10) { + this.drawTexturedModalRect( + xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, potionOffset, 9, 9); + } + } + + this.mc.getTextureManager().bindTexture(icons); + GuiIngameForge.left_height += 10; + if (absorb > 0) GuiIngameForge.left_height += 10; + + event.setCanceled(true); + if (event.type == ElementType.CROSSHAIRS && gs.thirdPersonView != 0) { + event.setCanceled(true); + } + } + } + } + + public void drawTexturedModalRect(int par1, int par2, int par3, int par4, int par5, int par6) { + float f = 0.00390625F; + float f1 = 0.00390625F; + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV( + (double) (par1 + 0), + (double) (par2 + par6), + (double) this.zLevel, + (double) ((float) (par3 + 0) * f), + (double) ((float) (par4 + par6) * f1)); + tessellator.addVertexWithUV( + (double) (par1 + par5), + (double) (par2 + par6), + (double) this.zLevel, + (double) ((float) (par3 + par5) * f), + (double) ((float) (par4 + par6) * f1)); + tessellator.addVertexWithUV( + (double) (par1 + par5), + (double) (par2 + 0), + (double) this.zLevel, + (double) ((float) (par3 + par5) * f), + (double) ((float) (par4 + 0) * f1)); + tessellator.addVertexWithUV( + (double) (par1 + 0), + (double) (par2 + 0), + (double) this.zLevel, + (double) ((float) (par3 + 0) * f), + (double) ((float) (par4 + 0) * f1)); + tessellator.draw(); + } + + double zLevel = 0; + + /* Armor rendering */ + @SubscribeEvent + public void adjustArmor(RenderPlayerEvent.SetArmorModel event) { + switch (event.slot) { + case 1: + ArmorProxyClient.vest.onGround = event.renderer.modelBipedMain.onGround; + ArmorProxyClient.vest.isRiding = event.renderer.modelBipedMain.isRiding; + ArmorProxyClient.vest.isChild = event.renderer.modelBipedMain.isChild; + ArmorProxyClient.vest.isSneak = event.renderer.modelBipedMain.isSneak; + case 2: + ArmorProxyClient.wings.onGround = event.renderer.modelBipedMain.onGround; + ArmorProxyClient.wings.isRiding = event.renderer.modelBipedMain.isRiding; + ArmorProxyClient.wings.isChild = event.renderer.modelBipedMain.isChild; + ArmorProxyClient.wings.isSneak = event.renderer.modelBipedMain.isSneak; + + ArmorProxyClient.glove.onGround = event.renderer.modelBipedMain.onGround; + ArmorProxyClient.glove.isRiding = event.renderer.modelBipedMain.isRiding; + ArmorProxyClient.glove.isChild = event.renderer.modelBipedMain.isChild; + ArmorProxyClient.glove.isSneak = event.renderer.modelBipedMain.isSneak; + ArmorProxyClient.glove.heldItemLeft = event.renderer.modelBipedMain.heldItemLeft; + ArmorProxyClient.glove.heldItemRight = event.renderer.modelBipedMain.heldItemRight; + + ArmorProxyClient.belt.onGround = event.renderer.modelBipedMain.onGround; + ArmorProxyClient.belt.isRiding = event.renderer.modelBipedMain.isRiding; + ArmorProxyClient.belt.isChild = event.renderer.modelBipedMain.isChild; + ArmorProxyClient.belt.isSneak = event.renderer.modelBipedMain.isSneak; + + renderArmorExtras(event); + + break; + case 3: + ArmorProxyClient.bootbump.onGround = event.renderer.modelBipedMain.onGround; + ArmorProxyClient.bootbump.isRiding = event.renderer.modelBipedMain.isRiding; + ArmorProxyClient.bootbump.isChild = event.renderer.modelBipedMain.isChild; + ArmorProxyClient.bootbump.isSneak = event.renderer.modelBipedMain.isSneak; + break; + } + } + + void renderArmorExtras(RenderPlayerEvent.SetArmorModel event) { + float partialTick = event.partialRenderTick; + + EntityPlayer player = event.entityPlayer; + + // todo: synchronize extra armor with other clients. Until then, only draw locally + if (player != Minecraft.getMinecraft().thePlayer) return; + + float posX = (float) (player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTick); + float posY = (float) (player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTick); + float posZ = (float) (player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTick); + + float yawOffset = this.interpolateRotation(player.prevRenderYawOffset, player.renderYawOffset, partialTick); + float yawRotation = this.interpolateRotation(player.prevRotationYawHead, player.rotationYawHead, partialTick); + float pitch; + final float zeropointsixtwofive = 0.0625F; + + if (player.isRiding() && player.ridingEntity instanceof EntityLivingBase) { + EntityLivingBase entitylivingbase1 = (EntityLivingBase) player.ridingEntity; + yawOffset = this.interpolateRotation( + entitylivingbase1.prevRenderYawOffset, entitylivingbase1.renderYawOffset, partialTick); + pitch = MathHelper.wrapAngleTo180_float(yawRotation - yawOffset); + + if (pitch < -85.0F) { + pitch = -85.0F; + } + + if (pitch >= 85.0F) { + pitch = 85.0F; + } + + yawOffset = yawRotation - pitch; + + if (pitch * pitch > 2500.0F) { + yawOffset += pitch * 0.2F; + } + } + + pitch = this.handleRotationFloat(player, partialTick); + float bodyRotation = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTick; + float limbSwing = + player.prevLimbSwingAmount + (player.limbSwingAmount - player.prevLimbSwingAmount) * partialTick; + float limbSwingMod = player.limbSwing - player.limbSwingAmount * (1.0F - partialTick); + // TPlayerStats stats = TPlayerStats.get(player); + ArmorExtended armor = ArmorProxyClient.armorExtended; // TODO: Do this for every player, not just the client + if (armor != null && armor.inventory[1] != null) { + Item item = armor.inventory[1].getItem(); + ModelBiped model = item.getArmorModel(player, armor.inventory[1], 4); + + if (item instanceof IAccessoryModel) { + this.mc + .getTextureManager() + .bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1)); + model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick); + model.render( + player, + limbSwingMod, + limbSwing, + pitch, + yawRotation - yawOffset, + bodyRotation, + zeropointsixtwofive); + } + } + + if (armor != null && armor.inventory[3] != null) { + Item item = armor.inventory[3].getItem(); + ModelBiped model = item.getArmorModel(player, armor.inventory[3], 5); + + if (item instanceof IAccessoryModel) { + this.mc + .getTextureManager() + .bindTexture(((IAccessoryModel) item).getWearbleTexture(player, armor.inventory[1], 1)); + model.setLivingAnimations(player, limbSwingMod, limbSwing, partialTick); + model.render( + player, + limbSwingMod, + limbSwing, + pitch, + yawRotation - yawOffset, + bodyRotation, + zeropointsixtwofive); + } + } + } + + private float interpolateRotation(float par1, float par2, float par3) { + float f3; + + for (f3 = par2 - par1; f3 < -180.0F; f3 += 360.0F) { + ; + } + + while (f3 >= 180.0F) { + f3 -= 360.0F; + } + + return par1 + par3 * f3; + } + + protected float handleRotationFloat(EntityLivingBase par1EntityLivingBase, float par2) { + return (float) par1EntityLivingBase.ticksExisted + par2; + } + + @Override + public void updatePlayerStats(TPlayerStats stats) { + + playerStats.copyFrom(stats, false); + armorExtended = stats.armor; + knapsack = stats.knapsack; + // dumpTPlayerStats(stats); + } } diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index 51d507eed15..7937471fae4 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -9,41 +9,34 @@ import tconstruct.armor.player.TPlayerStats; import tconstruct.common.TProxyCommon; -public class ArmorProxyCommon implements IGuiHandler -{ +public class ArmorProxyCommon implements IGuiHandler { public static final int inventoryGui = 100; public static final int armorGuiID = 101; public static final int knapsackGuiID = 102; public void preInit() {} - public void initialize () - { + public void initialize() { registerGuiHandler(); } - protected void registerGuiHandler () - { + protected void registerGuiHandler() { TProxyCommon.registerServerGuiHandler(inventoryGui, this); TProxyCommon.registerServerGuiHandler(armorGuiID, this); TProxyCommon.registerServerGuiHandler(knapsackGuiID, this); } @Override - public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { - if (ID == ArmorProxyCommon.inventoryGui) - { + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + if (ID == ArmorProxyCommon.inventoryGui) { // GuiInventory inv = new GuiInventory(player); return player.inventoryContainer; } - if (ID == ArmorProxyCommon.armorGuiID) - { + if (ID == ArmorProxyCommon.armorGuiID) { TPlayerStats stats = TPlayerStats.get(player); return new ArmorExtendedContainer(player.inventory, stats.armor); } - if (ID == ArmorProxyCommon.knapsackGuiID) - { + if (ID == ArmorProxyCommon.knapsackGuiID) { TPlayerStats stats = TPlayerStats.get(player); return new KnapsackContainer(player.inventory, stats.knapsack); } @@ -52,29 +45,18 @@ public Object getServerGuiElement (int ID, EntityPlayer player, World world, int } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { // TODO Auto-generated method stub return null; } - public void registerTickHandler () - { + public void registerTickHandler() {} - } + public void registerKeys() {} - public void registerKeys () - { + public void updatePlayerStats(TPlayerStats stats) {} - } - - public void updatePlayerStats(TPlayerStats stats) - { - - } - - public void dumpTPlayerStats(TPlayerStats stats) - { + public void dumpTPlayerStats(TPlayerStats stats) { TConstruct.logger.debug("~~~~~~~~~~~~~~~~~ STATS ~~~~~~~~~~~~~~~~~"); TConstruct.logger.debug("Player: " + stats.player.get().getCommandSenderName()); TConstruct.logger.debug("Level: " + stats.level); @@ -91,19 +73,15 @@ public void dumpTPlayerStats(TPlayerStats stats) TConstruct.logger.debug("BattleSign Bonus: " + stats.battlesignBonus); TConstruct.logger.debug("Derp Level: " + stats.derpLevel); int i = 0; - for (ItemStack stack : stats.armor.inventory) - { - if (stack != null) - { - TConstruct.logger.debug("Armor Slot: " + i + " Contains: " + stack.getDisplayName()); + for (ItemStack stack : stats.armor.inventory) { + if (stack != null) { + TConstruct.logger.debug("Armor Slot: " + i + " Contains: " + stack.getDisplayName()); } i++; } i = 0; - for (ItemStack stack : stats.knapsack.inventory) - { - if (stack != null) - { + for (ItemStack stack : stats.knapsack.inventory) { + if (stack != null) { TConstruct.logger.debug("Knapsack Slot: " + i + " Contains: " + stack.getDisplayName()); } i++; diff --git a/src/main/java/tconstruct/armor/ArmorTickHandler.java b/src/main/java/tconstruct/armor/ArmorTickHandler.java index 34e3b3da65d..9725690f50d 100644 --- a/src/main/java/tconstruct/armor/ArmorTickHandler.java +++ b/src/main/java/tconstruct/armor/ArmorTickHandler.java @@ -6,21 +6,18 @@ import net.minecraft.client.Minecraft; import tconstruct.client.ArmorControls; -public class ArmorTickHandler -{ +public class ArmorTickHandler { Minecraft mc = Minecraft.getMinecraft(); ArmorControls controlInstance = ((ArmorProxyClient) TinkerArmor.proxy).controlInstance; @SideOnly(Side.CLIENT) @SubscribeEvent - public void tickEnd (ClientTickEvent event) - { + public void tickEnd(ClientTickEvent event) { /*TinkerWorld.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P); TinkerWorld.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P); TinkerWorld.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P);*/ - if (mc.thePlayer != null && mc.thePlayer.onGround) - controlInstance.landOnGround(); + if (mc.thePlayer != null && mc.thePlayer.onGround) controlInstance.landOnGround(); } /* diff --git a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java index 71493c1c456..9604cf84e7e 100644 --- a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java +++ b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java @@ -8,48 +8,37 @@ import tconstruct.armor.player.*; import tconstruct.util.config.PHConstruct; -public class PlayerAbilityHelper -{ +public class PlayerAbilityHelper { - public static void toggleGoggles (EntityPlayer player, boolean active) - { + public static void toggleGoggles(EntityPlayer player, boolean active) { TPlayerStats stats = TPlayerStats.get(player); stats.activeGoggles = active; - if (!stats.activeGoggles) - { + if (!stats.activeGoggles) { player.removePotionEffect(Potion.nightVision.id); - } - else - { + } else { player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0, true)); } } - public static boolean isDimensionAllowed (EntityPlayer player) { + public static boolean isDimensionAllowed(EntityPlayer player) { int currentDimID = player.worldObj.provider.dimensionId; - for (int id : PHConstruct.cfgForbiddenDim) - { - if (id == currentDimID) - return false; + for (int id : PHConstruct.cfgForbiddenDim) { + if (id == currentDimID) return false; } return true; } - public static void swapBelt (EntityPlayer player, ArmorExtended armor) - { + public static void swapBelt(EntityPlayer player, ArmorExtended armor) { if (!isDimensionAllowed(player)) return; NBTTagList slots = new NBTTagList(); InventoryPlayer hotbar = player.inventory; ItemStack belt = armor.inventory[3]; - if(belt == null) - return; + if (belt == null) return; NBTTagCompound itemTag; - for (int i = 0; i < 9; ++i) - { - if (hotbar.mainInventory[i] != null) - { + for (int i = 0; i < 9; ++i) { + if (hotbar.mainInventory[i] != null) { itemTag = new NBTTagCompound(); itemTag.setByte("Slot", (byte) i); hotbar.mainInventory[i].writeToNBT(itemTag); @@ -59,16 +48,13 @@ public static void swapBelt (EntityPlayer player, ArmorExtended armor) } NBTTagList replaceSlots = belt.getTagCompound().getTagList("Inventory", 10); - for (int i = 0; i < replaceSlots.tagCount(); ++i) - { + for (int i = 0; i < replaceSlots.tagCount(); ++i) { NBTTagCompound nbttagcompound = replaceSlots.getCompoundTagAt(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); - if (itemstack != null) - { - if (j >= 0 && j < hotbar.mainInventory.length) - { + if (itemstack != null) { + if (j >= 0 && j < hotbar.mainInventory.length) { hotbar.mainInventory[j] = itemstack; } } @@ -76,12 +62,10 @@ public static void swapBelt (EntityPlayer player, ArmorExtended armor) belt.getTagCompound().setTag("Inventory", slots); } - public static void setEntitySize (Entity entity, float width, float height) - { + public static void setEntitySize(Entity entity, float width, float height) { float f2; - if (width != entity.width || height != entity.height) - { + if (width != entity.width || height != entity.height) { f2 = entity.width; entity.width = width; entity.height = height; @@ -89,36 +73,24 @@ public static void setEntitySize (Entity entity, float width, float height) entity.boundingBox.maxZ = entity.boundingBox.minZ + (double) entity.width; entity.boundingBox.maxY = entity.boundingBox.minY + (double) entity.height; - if (entity.width > f2 && !entity.worldObj.isRemote) - { + if (entity.width > f2 && !entity.worldObj.isRemote) { entity.moveEntity((double) (f2 - entity.width), 0.0D, (double) (f2 - entity.width)); } } f2 = width % 2.0F; - if ((double) f2 < 0.375D) - { + if ((double) f2 < 0.375D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_1; - } - else if ((double) f2 < 0.75D) - { + } else if ((double) f2 < 0.75D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_2; - } - else if ((double) f2 < 1.0D) - { + } else if ((double) f2 < 1.0D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_3; - } - else if ((double) f2 < 1.375D) - { + } else if ((double) f2 < 1.375D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_4; - } - else if ((double) f2 < 1.75D) - { + } else if ((double) f2 < 1.75D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_5; - } - else - { + } else { entity.myEntitySize = Entity.EnumEntitySize.SIZE_6; } } diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 6afe3745ce5..6e4d83ab591 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -4,10 +4,7 @@ import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import cpw.mods.fml.relauncher.Side; - import java.util.EnumSet; - import mantle.pulsar.pulse.*; import net.minecraft.block.Block; import net.minecraft.init.*; @@ -21,8 +18,6 @@ import tconstruct.armor.blocks.DryingRack; import tconstruct.armor.items.*; import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.client.ArmorControls; -import tconstruct.client.tabs.TabRegistry; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.AccessoryCore; import tconstruct.library.armor.ArmorPart; @@ -30,14 +25,12 @@ import tconstruct.modifiers.accessory.GloveSpeed; import tconstruct.modifiers.armor.*; import tconstruct.modifiers.tools.ModAttack; -import tconstruct.modifiers.tools.ModInteger; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Armory", description = "Modifyable armors, such as the traveller's gear.") -public class TinkerArmor -{ +public class TinkerArmor { @SidedProxy(clientSide = "tconstruct.armor.ArmorProxyClient", serverSide = "tconstruct.armor.ArmorProxyCommon") public static ArmorProxyCommon proxy; @@ -63,7 +56,7 @@ public class TinkerArmor public static Item bootsWood; public static ArmorMaterial materialWood; - //Clothing - Travel Gear + // Clothing - Travel Gear public static TravelGear travelGoggles; public static TravelGear travelWings; public static TravelGear travelVest; @@ -74,8 +67,7 @@ public class TinkerArmor public static ModAttack modAttackGlove; @Handler - public void preInit (FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(); MinecraftForge.EVENT_BUS.register(new TinkerArmorEvents()); @@ -87,8 +79,7 @@ public void preInit (FMLPreInitializationEvent event) TinkerArmor.diamondApple = new DiamondApple().setUnlocalizedName("tconstruct.apple.diamond"); GameRegistry.registerItem(TinkerArmor.diamondApple, "diamondApple"); boolean foodOverhaul = false; - if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food")) - { + if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food")) { foodOverhaul = true; } @@ -111,11 +102,15 @@ public void preInit (FMLPreInitializationEvent event) GameRegistry.registerItem(TinkerArmor.knapsack, "knapsack"); LiquidCasting basinCasting = TConstruct.getBasinCasting(); - TinkerArmor.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); - TinkerArmor.helmetWood = new ArmorBasic(TinkerArmor.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); - TinkerArmor.chestplateWood = new ArmorBasic(TinkerArmor.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); - TinkerArmor.leggingsWood = new ArmorBasic(TinkerArmor.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); - TinkerArmor.bootsWood = new ArmorBasic(TinkerArmor.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); + TinkerArmor.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] {1, 2, 2, 1}, 3); + TinkerArmor.helmetWood = + new ArmorBasic(TinkerArmor.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); + TinkerArmor.chestplateWood = + new ArmorBasic(TinkerArmor.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); + TinkerArmor.leggingsWood = + new ArmorBasic(TinkerArmor.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); + TinkerArmor.bootsWood = + new ArmorBasic(TinkerArmor.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); GameRegistry.registerItem(TinkerArmor.helmetWood, "helmetWood"); GameRegistry.registerItem(TinkerArmor.chestplateWood, "chestplateWood"); GameRegistry.registerItem(TinkerArmor.leggingsWood, "leggingsWood"); @@ -141,8 +136,7 @@ public void preInit (FMLPreInitializationEvent event) } @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { craftingTableRecipes(); registerModifiers(); addRecipesForDryingRack(); @@ -151,58 +145,139 @@ public void init (FMLInitializationEvent event) } @Handler - public void postInit (FMLPostInitializationEvent evt) - { + public void postInit(FMLPostInitializationEvent evt) { proxy.registerTickHandler(); } - private void craftingTableRecipes () - { + private void craftingTableRecipes() { // Armor Recipes - Object[] helm = new String[] { "www", "w w" }; - Object[] chest = new String[] { "w w", "www", "www" }; - Object[] pants = new String[] { "www", "w w", "w w" }; - Object[] shoes = new String[] { "w w", "w w" }; + Object[] helm = new String[] {"www", "w w"}; + Object[] chest = new String[] {"w w", "www", "www"}; + Object[] pants = new String[] {"www", "w w", "w w"}; + Object[] shoes = new String[] {"w w", "w w"}; GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.helmetWood, helm, 'w', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.chestplateWood, chest, 'w', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.leggingsWood, pants, 'w', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.bootsWood, shoes, 'w', "logWood")); // Accessories - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); // GameRegistry.addRecipe(new ShapedOreRecipe(new // ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', // "ingotNaturalAluminum")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerArmor.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.diamondApple), " d ", "d#d", " d ", 'd', "gemDiamond", '#', new ItemStack(Items.apple))); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.diamondApple), new ItemStack(TinkerTools.materials, 1, 8), new ItemStack(TinkerArmor.heartCanister, 1, 0), new ItemStack(TinkerArmor.heartCanister, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 1), new ItemStack(TinkerArmor.heartCanister, 1, 3)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 4), new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.heartCanister, 1, 3), new ItemStack(Items.golden_apple, 1, 1)); - //GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerArmor.diamondApple), + " d ", + "d#d", + " d ", + 'd', + "gemDiamond", + '#', + new ItemStack(Items.apple))); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerArmor.heartCanister, 1, 2), + new ItemStack(TinkerArmor.diamondApple), + new ItemStack(TinkerTools.materials, 1, 8), + new ItemStack(TinkerArmor.heartCanister, 1, 0), + new ItemStack(TinkerArmor.heartCanister, 1, 1)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerArmor.heartCanister, 1, 1), new ItemStack(TinkerArmor.heartCanister, 1, 3)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerArmor.heartCanister, 1, 4), + new ItemStack(TinkerArmor.heartCanister, 1, 2), + new ItemStack(TinkerArmor.heartCanister, 1, 3), + new ItemStack(Items.golden_apple, 1, 1)); + // GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new + // ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', "ingotGold")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerArmor.knapsack, 1, 0), + "###", + "rmr", + "###", + '#', + new ItemStack(Items.leather), + 'r', + new ItemStack(TinkerTools.toughRod, 1, 2), + 'm', + "ingotGold")); ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); - GameRegistry.addRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', aluBrass); + GameRegistry.addRecipe( + new ItemStack(TinkerArmor.knapsack, 1, 0), + "###", + "rmr", + "###", + '#', + new ItemStack(Items.leather), + 'r', + new ItemStack(TinkerTools.toughRod, 1, 2), + 'm', + aluBrass); // Drying Rack Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood")); - //Temporary recipes + // Temporary recipes ItemStack leather = new ItemStack(Items.leather); ItemStack glass = new ItemStack(Blocks.glass); ItemStack string = new ItemStack(Items.string); - GameRegistry.addRecipe(new ShapedOreRecipe(travelGoggles.getDefaultItem(), "# #", "q#q", "g g", '#', leather, 'q', "blockGlass", 'g', "ingotGold")); - GameRegistry.addRecipe(new ShapedOreRecipe(travelWings.getDefaultItem(), "g g", "i#i", "i i", '#', Items.ender_pearl, 'g', "ingotGold", 'i', "ingotBronze")); - GameRegistry.addRecipe(new ShapedOreRecipe(travelVest.getDefaultItem(), "#w#", "#i#", "#w#", '#', leather, 'i', "ingotAluminum", 'w', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(travelBoots.getDefaultItem(), "#s#", "#i#", "#s#", '#', leather, 's', string, 'i', "ingotAluminum")); + GameRegistry.addRecipe(new ShapedOreRecipe( + travelGoggles.getDefaultItem(), + "# #", + "q#q", + "g g", + '#', + leather, + 'q', + "blockGlass", + 'g', + "ingotGold")); + GameRegistry.addRecipe(new ShapedOreRecipe( + travelWings.getDefaultItem(), + "g g", + "i#i", + "i i", + '#', + Items.ender_pearl, + 'g', + "ingotGold", + 'i', + "ingotBronze")); + GameRegistry.addRecipe(new ShapedOreRecipe( + travelVest.getDefaultItem(), + "#w#", + "#i#", + "#w#", + '#', + leather, + 'i', + "ingotAluminum", + 'w', + new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe( + travelBoots.getDefaultItem(), "#s#", "#i#", "#s#", '#', leather, 's', string, 'i', "ingotAluminum")); GameRegistry.addShapedRecipe(travelGlove.getDefaultItem(), " #", "###", " ##", '#', leather); - GameRegistry.addRecipe(new ShapedOreRecipe(travelBelt.getDefaultItem(), "###", "ici", "###", '#', leather, 'c', "chestWood", 'i', "ingotAluminum")); + GameRegistry.addRecipe(new ShapedOreRecipe( + travelBelt.getDefaultItem(), + "###", + "ici", + "###", + '#', + leather, + 'c', + "chestWood", + 'i', + "ingotAluminum")); } - protected static void addRecipesForDryingRack () - { + protected static void addRecipesForDryingRack() { // Drying rack DryingRackRecipes.addDryingRecipe(Items.beef, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 0)); DryingRackRecipes.addDryingRecipe(Items.chicken, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 1)); @@ -211,46 +286,148 @@ protected static void addRecipesForDryingRack () // ItemStack(TRepo.jerky, 1, 3)); DryingRackRecipes.addDryingRecipe(Items.fish, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 4)); DryingRackRecipes.addDryingRecipe(Items.rotten_flesh, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 5)); - DryingRackRecipes.addDryingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 6)); - DryingRackRecipes.addDryingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 7)); + DryingRackRecipes.addDryingRecipe( + new ItemStack(TinkerWorld.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 6)); + DryingRackRecipes.addDryingRecipe( + new ItemStack(TinkerWorld.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 7)); // DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.jerky, 1, 5), // 20 * 60 * 10, Item.leather); } - private void registerModifiers () - { + private void registerModifiers() { ItemStack redstoneItem = new ItemStack(Items.redstone); ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); - //Travel gear modifiers - //MultiType - ModifyBuilder.registerModifier(new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Blocks.piston) })); - ModifyBuilder.registerModifier(new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston) })); - ModifyBuilder.registerModifier(new AModInteger(4, "Moss", EnumSet.of(ArmorPart.Legs, ArmorPart.Feet, ArmorPart.Chest, ArmorPart.Head), new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, 3, "\u00a72", StatCollector.translateToLocal("modifier.tool.moss"))); + // Travel gear modifiers + // MultiType + ModifyBuilder.registerModifier( + new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { + new ItemStack(Items.ghast_tear), + new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Blocks.piston) + })); + ModifyBuilder.registerModifier( + new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { + new ItemStack(Items.ghast_tear), + new ItemStack(TinkerWorld.slimeGel, 1, 1), + new ItemStack(Blocks.piston) + })); + ModifyBuilder.registerModifier(new AModInteger( + 4, + "Moss", + EnumSet.of(ArmorPart.Legs, ArmorPart.Feet, ArmorPart.Chest, ArmorPart.Head), + new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 6)}, + 3, + "\u00a72", + StatCollector.translateToLocal("modifier.tool.moss"))); ModifyBuilder.registerModifier(new TravelModRepair()); TConstructRegistry.registerActiveArmorMod(new ActiveTinkerArmor()); - //Head - ModifyBuilder.registerModifier(new AModBoolean(0, "Night Vision", EnumSet.of(ArmorPart.Head), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 8198), new ItemStack(Items.golden_carrot) }, "\u00a78", "Night Vision")); + // Head + ModifyBuilder.registerModifier(new AModBoolean( + 0, + "Night Vision", + EnumSet.of(ArmorPart.Head), + new ItemStack[] { + new ItemStack(Items.flint_and_steel), + new ItemStack(Items.potionitem, 1, 8198), + new ItemStack(Items.golden_carrot) + }, + "\u00a78", + "Night Vision")); - //Chest - ModifyBuilder.registerModifier(new AModInteger(0, "Perfect Dodge", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar) }, 1, "\u00a7d", "Perfect Dodge")); - ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 8206), new ItemStack(Items.golden_carrot) }, "\u00a78", "Stealth")); + // Chest + ModifyBuilder.registerModifier(new AModInteger( + 0, + "Perfect Dodge", + EnumSet.of(ArmorPart.Chest), + new ItemStack[] { + new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar) + }, + 1, + "\u00a7d", + "Perfect Dodge")); + ModifyBuilder.registerModifier(new AModBoolean( + 1, + "Stealth", + EnumSet.of(ArmorPart.Chest), + new ItemStack[] { + new ItemStack(Items.fermented_spider_eye), + new ItemStack(Items.ender_eye), + new ItemStack(Items.potionitem, 1, 8206), + new ItemStack(Items.golden_carrot) + }, + "\u00a78", + "Stealth")); - //Wings + // Wings ItemStack feather = new ItemStack(Items.feather); - ModifyBuilder.registerModifier(new AModInteger(1, "Feather Fall", EnumSet.of(ArmorPart.Legs), new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.ender_pearl), feather, feather, feather, feather, feather, feather }, 1, "\u00a7f", "Feather Fall")); - ModifyBuilder.registerModifier(new AModInteger(1, "Feather Fall", EnumSet.of(ArmorPart.Legs), new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Items.ender_pearl), feather, feather, feather, feather, feather, feather }, 1, "\u00a7f", "Feather Fall")); + ModifyBuilder.registerModifier(new AModInteger( + 1, + "Feather Fall", + EnumSet.of(ArmorPart.Legs), + new ItemStack[] { + new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Items.ender_pearl), + feather, + feather, + feather, + feather, + feather, + feather + }, + 1, + "\u00a7f", + "Feather Fall")); + ModifyBuilder.registerModifier(new AModInteger( + 1, + "Feather Fall", + EnumSet.of(ArmorPart.Legs), + new ItemStack[] { + new ItemStack(TinkerWorld.slimeGel, 1, 1), + new ItemStack(Items.ender_pearl), + feather, + feather, + feather, + feather, + feather, + feather + }, + 1, + "\u00a7f", + "Feather Fall")); - //Feet - ModifyBuilder.registerModifier(new AModBoolean(1, "WaterWalk", EnumSet.of(ArmorPart.Feet), new ItemStack[] { new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily) }, "\u00a79", "Water-Walking")); - ModifyBuilder.registerModifier(new AModLeadBoots(new ItemStack[] { new ItemStack(Blocks.iron_block) })); - ModifyBuilder.registerModifier(new AModInteger(3, "Slimy Soles", EnumSet.of(ArmorPart.Feet), new ItemStack[] { new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimePad, 1, 0) }, 1, "\u00a7a", "Slimy Soles")); + // Feet + ModifyBuilder.registerModifier(new AModBoolean( + 1, + "WaterWalk", + EnumSet.of(ArmorPart.Feet), + new ItemStack[] {new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily)}, + "\u00a79", + "Water-Walking")); + ModifyBuilder.registerModifier(new AModLeadBoots(new ItemStack[] {new ItemStack(Blocks.iron_block)})); + ModifyBuilder.registerModifier(new AModInteger( + 3, + "Slimy Soles", + EnumSet.of(ArmorPart.Feet), + new ItemStack[] {new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimePad, 1, 0)}, + 1, + "\u00a7a", + "Slimy Soles")); - //Glove - ModifyBuilder.registerModifier(new GloveSpeed(1, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); - //ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) })); - modAttackGlove = new ModAttack("Quartz", 2, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, 50, 50, "Accessory"); - //ModifyBuilder.registerModifier(modAttackGlove); + // Glove + ModifyBuilder.registerModifier( + new GloveSpeed(1, new ItemStack[] {redstoneItem, redstoneBlock}, new int[] {1, 9})); + // ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new + // ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) })); + modAttackGlove = new ModAttack( + "Quartz", + 2, + new ItemStack[] {new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)}, + new int[] {1, 4}, + 50, + 50, + "Accessory"); + // ModifyBuilder.registerModifier(modAttackGlove); } } diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index cdf50d0ced1..203b9d2967f 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -1,7 +1,7 @@ package tconstruct.armor; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; +import java.util.Locale; import net.minecraft.entity.boss.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.IMob; @@ -14,47 +14,47 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import tconstruct.TConstruct; import tconstruct.armor.items.TravelWings; -import tconstruct.armor.player.ArmorExtended; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.ArmourGuiSyncPacket; -import tconstruct.world.entity.BlueSlime; - -import java.util.Locale; -public class TinkerArmorEvents -{ +public class TinkerArmorEvents { @SubscribeEvent - public void onLivingDrop (LivingDropsEvent event) - { - if (event.entityLiving == null) - return; + public void onLivingDrop(LivingDropsEvent event) { + if (event.entityLiving == null) return; - if(!event.entityLiving.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) - return; + if (!event.entityLiving.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) return; - if (TConstruct.random.nextInt(200) == 0 && event.entityLiving instanceof IMob && event.source.damageType.equals("player")) - { + if (TConstruct.random.nextInt(200) == 0 + && event.entityLiving instanceof IMob + && event.source.damageType.equals("player")) { ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1); - EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); + EntityItem entityitem = new EntityItem( + event.entityLiving.worldObj, + event.entityLiving.posX, + event.entityLiving.posY, + event.entityLiving.posZ, + dropStack); entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); } - if (event.entityLiving instanceof IBossDisplayData) - { + if (event.entityLiving instanceof IBossDisplayData) { String entityName = event.entityLiving.getClass().getSimpleName().toLowerCase(); - for(String name : PHConstruct.heartDropBlacklist) - if (name.toLowerCase(Locale.US).equals(entityName)) - return; + for (String name : PHConstruct.heartDropBlacklist) + if (name.toLowerCase(Locale.US).equals(entityName)) return; int count = event.entityLiving instanceof EntityDragon ? 5 : 1; - for (int i = 0; i < count; i++) - { + for (int i = 0; i < count; i++) { ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 3); - EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); + EntityItem entityitem = new EntityItem( + event.entityLiving.worldObj, + event.entityLiving.posX, + event.entityLiving.posY, + event.entityLiving.posZ, + dropStack); entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); } @@ -63,20 +63,18 @@ public void onLivingDrop (LivingDropsEvent event) /* Abilities */ @SubscribeEvent - public void armorMineSpeed (net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed event) - { - if(event.entityPlayer == null) - return; + public void armorMineSpeed(net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed event) { + if (event.entityPlayer == null) return; ItemStack glove = TPlayerStats.get(event.entityPlayer).armor.getStackInSlot(1); - if(event.entityPlayer.worldObj.isRemote) { // todo: sync extended inventory with clients so this stuff and rendering is done properly... - if(ArmorProxyClient.armorExtended != null) - glove = ArmorProxyClient.armorExtended.getStackInSlot(1); - else - glove = null; + if (event.entityPlayer + .worldObj + .isRemote) { // todo: sync extended inventory with clients so this stuff and rendering is done + // properly... + if (ArmorProxyClient.armorExtended != null) glove = ArmorProxyClient.armorExtended.getStackInSlot(1); + else glove = null; } - if(glove == null || !glove.hasTagCompound()) - return; + if (glove == null || !glove.hasTagCompound()) return; // ok, we got a glove. bonus mining speeeeed NBTTagCompound tags = glove.getTagCompound().getCompoundTag(TinkerArmor.travelGlove.getBaseTagName()); @@ -88,25 +86,21 @@ public void armorMineSpeed (net.minecraftforge.event.entity.player.PlayerEvent.B } @SubscribeEvent - public void jumpHeight (LivingJumpEvent event) - { + public void jumpHeight(LivingJumpEvent event) { ItemStack stack = event.entityLiving.getEquipmentInSlot(2); - if (stack != null && stack.getItem() instanceof TravelWings) - { + if (stack != null && stack.getItem() instanceof TravelWings) { event.entityLiving.motionY += 0.2; } } @SubscribeEvent - public void slimefall (LivingFallEvent event) - { + public void slimefall(LivingFallEvent event) { ItemStack boots = event.entityLiving.getEquipmentInSlot(1); - if (boots != null && boots.getItem() instanceof IModifyable) - { - NBTTagCompound tag = boots.getTagCompound().getCompoundTag(((IModifyable) boots.getItem()).getBaseTagName()); + if (boots != null && boots.getItem() instanceof IModifyable) { + NBTTagCompound tag = + boots.getTagCompound().getCompoundTag(((IModifyable) boots.getItem()).getBaseTagName()); int sole = tag.getInteger("Slimy Soles"); - if (sole > 0) - { + if (sole > 0) { event.distance /= (1 + sole); event.entityLiving.fallDistance /= (1 + sole); } @@ -114,38 +108,30 @@ public void slimefall (LivingFallEvent event) } @SubscribeEvent - public void perfectDodge(LivingAttackEvent event) - { - if(!event.source.isProjectile()) - return; + public void perfectDodge(LivingAttackEvent event) { + if (!event.source.isProjectile()) return; // perfect dodge? - if(!(event.entityLiving instanceof EntityPlayer)) - return; + if (!(event.entityLiving instanceof EntityPlayer)) return; EntityPlayer player = (EntityPlayer) event.entityLiving; ItemStack chest = player.getCurrentArmor(2); - if(chest == null || !(chest.getItem() instanceof IModifyable) || !chest.hasTagCompound()) - return; + if (chest == null || !(chest.getItem() instanceof IModifyable) || !chest.hasTagCompound()) return; NBTTagCompound tags = chest.getTagCompound().getCompoundTag(((IModifyable) chest.getItem()).getBaseTagName()); int dodge = tags.getInteger("Perfect Dodge"); - if(dodge > TConstruct.random.nextInt(10)) - event.setCanceled(true); + if (dodge > TConstruct.random.nextInt(10)) event.setCanceled(true); } - + @SubscribeEvent - public void joinWorld(EntityJoinWorldEvent event) - { - if (event.entity instanceof EntityPlayerMP) - { - EntityPlayerMP player = (EntityPlayerMP)event.entity; + public void joinWorld(EntityJoinWorldEvent event) { + if (event.entity instanceof EntityPlayerMP) { + EntityPlayerMP player = (EntityPlayerMP) event.entity; TPlayerStats stats = TPlayerStats.get(player); NBTTagCompound tag = new NBTTagCompound(); stats.saveNBTData(tag); ArmourGuiSyncPacket syncPacket = new ArmourGuiSyncPacket(tag); TConstruct.packetPipeline.sendTo(syncPacket, player); } - } } diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index 318147db14d..2f96d65fdc6 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -17,11 +17,9 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; -public class DryingRack extends InventoryBlock -{ +public class DryingRack extends InventoryBlock { - public DryingRack() - { + public DryingRack() { super(Material.wood); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(2.0f); @@ -29,76 +27,60 @@ public DryingRack() } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { + public TileEntity createNewTileEntity(World world, int metadata) { return new DryingRackLogic(); } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 1; } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return null; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public int onBlockPlaced (World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) - { - if (side > 1) - return side; + public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) { + if (side > 1) return side; return meta; } - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving living, ItemStack stack) - { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving living, ItemStack stack) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 0) - { + if (meta == 0) { int l = MathHelper.floor_double((double) (living.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int direction = l % 2; - if (direction == 1) - world.setBlockMetadataWithNotify(x, y, z, 1, 2); + if (direction == 1) world.setBlockMetadataWithNotify(x, y, z, 1, 2); } } /* Activation */ @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) - { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { return activateDryingRack(world, x, y, z, player); } - boolean activateDryingRack (World world, int x, int y, int z, EntityPlayer player) - { - if (!world.isRemote) - { + boolean activateDryingRack(World world, int x, int y, int z, EntityPlayer player) { + if (!world.isRemote) { DryingRackLogic logic = (DryingRackLogic) world.getTileEntity(x, y, z); - if (!logic.isStackInSlot(0)) - { + if (!logic.isStackInSlot(0)) { ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null) - { + if (stack != null) { stack = player.inventory.decrStackSize(player.inventory.currentItem, 1); logic.setInventorySlotContents(0, stack); } - } - else - { + } else { ItemStack decrStack = logic.decrStackSize(0, 1); - if (decrStack != null) - AbilityHelper.spawnItemAtPlayer(player, decrStack); + if (decrStack != null) AbilityHelper.spawnItemAtPlayer(player, decrStack); } world.markBlockForUpdate(x, y, z); @@ -107,8 +89,7 @@ boolean activateDryingRack (World world, int x, int y, int z, EntityPlayer playe } @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); float xMin = 0F; float yMin = 0F; @@ -116,41 +97,45 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, float xMax = 1F; float yMax = 1F; float zMax = 1F; - switch (metadata) - { - case 0: - zMin = 0.375F; - yMax = 0.25F; - zMax = 0.625F; - break; - case 1: - xMin = 0.375F; - yMax = 0.25F; - xMax = 0.625F; - break; - case 2: - zMin = 0.75F; - yMin = 0.75F; - break; - case 3: - zMax = 0.25F; - yMin = 0.75F; - break; - case 4: - xMin = 0.75F; - yMin = 0.75F; - break; - case 5: - xMax = 0.25F; - yMin = 0.75F; - break; + switch (metadata) { + case 0: + zMin = 0.375F; + yMax = 0.25F; + zMax = 0.625F; + break; + case 1: + xMin = 0.375F; + yMax = 0.25F; + xMax = 0.625F; + break; + case 2: + zMin = 0.75F; + yMin = 0.75F; + break; + case 3: + zMax = 0.25F; + yMin = 0.75F; + break; + case 4: + xMin = 0.75F; + yMin = 0.75F; + break; + case 5: + xMax = 0.25F; + yMin = 0.75F; + break; } - return AxisAlignedBB.getBoundingBox((double) x + xMin, (double) y + yMin, (double) z + zMin, (double) x + xMax, (double) y + yMax, (double) z + zMax); + return AxisAlignedBB.getBoundingBox( + (double) x + xMin, + (double) y + yMin, + (double) z + zMin, + (double) x + xMax, + (double) y + yMax, + (double) z + zMax); } @Override - public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) - { + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); float xMin = 0F; float yMin = 0F; @@ -158,98 +143,95 @@ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) float xMax = 1F; float yMax = 1F; float zMax = 1F; - switch (metadata) - { - case 0: - zMin = 0.375F; - yMax = 0.25F; - zMax = 0.625F; - break; - case 1: - xMin = 0.375F; - yMax = 0.25F; - xMax = 0.625F; - break; - case 2: - zMin = 0.75F; - yMin = 0.75F; - break; - case 3: - zMax = 0.25F; - yMin = 0.75F; - break; - case 4: - xMin = 0.75F; - yMin = 0.75F; - break; - case 5: - xMax = 0.25F; - yMin = 0.75F; - break; + switch (metadata) { + case 0: + zMin = 0.375F; + yMax = 0.25F; + zMax = 0.625F; + break; + case 1: + xMin = 0.375F; + yMax = 0.25F; + xMax = 0.625F; + break; + case 2: + zMin = 0.75F; + yMin = 0.75F; + break; + case 3: + zMax = 0.25F; + yMin = 0.75F; + break; + case 4: + xMin = 0.75F; + yMin = 0.75F; + break; + case 5: + xMax = 0.25F; + yMin = 0.75F; + break; } this.setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax); } @Override - public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) - { + public void addCollisionBoxesToList( + World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { this.setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); } /* Rendering */ @Override - public int getRenderType () - { + public int getRenderType() { return DryingRackRender.model; } @Override - public String[] getTextureNames () - { - String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", "blockcast_side", "blockcast_bottom" }; + public String[] getTextureNames() { + String[] textureNames = { + "castingtable_top", + "castingtable_side", + "castingtable_bottom", + "faucet", + "blockcast_top", + "blockcast_side", + "blockcast_bottom" + }; return textureNames; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return Blocks.planks.getIcon(side, 0); } - public int getTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public TileEntity createTileEntity (World world, int metadata) - { + public TileEntity createTileEntity(World world, int metadata) { return new DryingRackLogic(); } @@ -271,11 +253,11 @@ public TileEntity createTileEntity (World world, int metadata) * != 1) { this.setBlockBounds(0, 0, 0, 1, 1, 1); } else { FaucetLogic logic * = (FaucetLogic) world.getBlockTileEntity(x, y, z); float xMin = 0.25F; * float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; - * + * * switch (logic.getRenderDirection()) { case 2: zMin = 0.625F; zMax = 1.0F; * break; case 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F; * xMax = 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; break; } - * + * * this.setBlockBounds(xMin, 0.25F, zMin, xMax, 0.625F, zMax); } } */ @@ -286,15 +268,15 @@ public TileEntity createTileEntity (World world, int metadata) * 1, y + 1, z + 1); } else { FaucetLogic logic = (FaucetLogic) * world.getBlockTileEntity(x, y, z); if (logic != null) { float xMin = * 0.25F; float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; - * + * * switch (logic.getRenderDirection()) { case 2: zMin = 0.625F; zMax = 1.0F; * break; case 3: zMax = 0.375F; zMin = 0F; break; case 4: xMin = 0.625F; * xMax = 1.0F; break; case 5: xMax = 0.375F; xMin = 0F; break; } - * + * * return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), * (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + * xMax), (double) y + 0.625, (double) ((float) z + zMax)); } } - * + * * return super.getCollisionBoundingBoxFromPool(world, x, y, z); } */ diff --git a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java index b8c41387088..bb7bda718b7 100644 --- a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java @@ -10,24 +10,21 @@ import tconstruct.armor.player.ArmorExtended; import tconstruct.client.tabs.*; -public class ArmorExtendedGui extends InventoryEffectRenderer -{ +public class ArmorExtendedGui extends InventoryEffectRenderer { public InventoryPlayer inv; public ArmorExtended stats; private float xSize_lo; private float ySize_lo; - public ArmorExtendedGui(InventoryPlayer inventoryplayer, ArmorExtended holder) - { + public ArmorExtendedGui(InventoryPlayer inventoryplayer, ArmorExtended holder) { super(new ArmorExtendedContainer(inventoryplayer, holder)); inv = inventoryplayer; stats = holder; } @Override - public void initGui () - { + public void initGui() { super.initGui(); int cornerX = guiLeft; @@ -47,8 +44,7 @@ public void initGui () } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { // fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"), // 60, 6, 0x404040); // fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), @@ -56,8 +52,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) } @Override - public void drawScreen (int par1, int par2, float par3) - { + public void drawScreen(int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); this.xSize_lo = (float) par1; this.ySize_lo = (float) par2; @@ -85,8 +80,7 @@ public void drawScreen (int par1, int par2, float par3) private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/armorextended.png"); @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); // mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); this.mc.getTextureManager().bindTexture(background); @@ -94,28 +88,26 @@ protected void drawGuiContainerBackgroundLayer (float f, int i, int j) int cornerY = guiTop; drawTexturedModalRect(cornerX, guiTop, 0, 0, xSize, ySize); - if (!stats.isStackInSlot(0)) - drawTexturedModalRect(cornerX + 79, cornerY + 16, 176, 9, 18, 18); - if (!stats.isStackInSlot(1)) - drawTexturedModalRect(cornerX + 79, cornerY + 34, 176, 27, 18, 18); - if (!stats.isStackInSlot(2)) - drawTexturedModalRect(cornerX + 115, cornerY + 16, 212, 9, 18, 18); - if (!stats.isStackInSlot(3)) - drawTexturedModalRect(cornerX + 115, cornerY + 34, 212, 27, 18, 18); - if (!stats.isStackInSlot(4)) - drawTexturedModalRect(cornerX + 151, cornerY + 52, 230, 0, 18, 18); - if (!stats.isStackInSlot(5)) - drawTexturedModalRect(cornerX + 151, cornerY + 34, 230, 18, 18, 18); - if (!stats.isStackInSlot(6)) - drawTexturedModalRect(cornerX + 151, cornerY + 16, 230, 36, 18, 18); + if (!stats.isStackInSlot(0)) drawTexturedModalRect(cornerX + 79, cornerY + 16, 176, 9, 18, 18); + if (!stats.isStackInSlot(1)) drawTexturedModalRect(cornerX + 79, cornerY + 34, 176, 27, 18, 18); + if (!stats.isStackInSlot(2)) drawTexturedModalRect(cornerX + 115, cornerY + 16, 212, 9, 18, 18); + if (!stats.isStackInSlot(3)) drawTexturedModalRect(cornerX + 115, cornerY + 34, 212, 27, 18, 18); + if (!stats.isStackInSlot(4)) drawTexturedModalRect(cornerX + 151, cornerY + 52, 230, 0, 18, 18); + if (!stats.isStackInSlot(5)) drawTexturedModalRect(cornerX + 151, cornerY + 34, 230, 18, 18, 18); + if (!stats.isStackInSlot(6)) drawTexturedModalRect(cornerX + 151, cornerY + 16, 230, 36, 18, 18); cornerX = this.guiLeft; cornerY = this.guiTop; - drawPlayerOnGui(this.mc, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.xSize_lo, (float) (cornerY + 75 - 50) - this.ySize_lo); + drawPlayerOnGui( + this.mc, + cornerX + 33, + cornerY + 75, + 30, + (float) (cornerX + 51) - this.xSize_lo, + (float) (cornerY + 75 - 50) - this.ySize_lo); } - public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) - { + public static void drawPlayerOnGui(Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) { GL11.glEnable(GL11.GL_COLOR_MATERIAL); GL11.glPushMatrix(); GL11.glTranslatef((float) par1, (float) par2, 50.0F); @@ -150,7 +142,7 @@ public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, /* * protected void keyTyped(char par1, int par2) { if (par2 == * TControls.armorKey.keyCode) { this.mc.thePlayer.closeScreen(); } - * + * * super.keyTyped(par1, par2); } */ } diff --git a/src/main/java/tconstruct/armor/gui/KnapsackGui.java b/src/main/java/tconstruct/armor/gui/KnapsackGui.java index b4927c4d27c..6713110b208 100644 --- a/src/main/java/tconstruct/armor/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/armor/gui/KnapsackGui.java @@ -8,21 +8,18 @@ import tconstruct.armor.player.KnapsackInventory; import tconstruct.client.tabs.*; -public class KnapsackGui extends InventoryEffectRenderer -{ +public class KnapsackGui extends InventoryEffectRenderer { public InventoryPlayer inv; public KnapsackInventory stats; - public KnapsackGui(InventoryPlayer inventoryplayer, KnapsackInventory holder) - { + public KnapsackGui(InventoryPlayer inventoryplayer, KnapsackInventory holder) { super(new KnapsackContainer(inventoryplayer, holder)); inv = inventoryplayer; stats = holder; } @Override - public void initGui () - { + public void initGui() { super.initGui(); int cornerX = guiLeft; @@ -45,17 +42,16 @@ public void initGui () } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png"); @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); int cornerX = guiLeft; @@ -66,7 +62,7 @@ protected void drawGuiContainerBackgroundLayer (float f, int i, int j) /* * protected void keyTyped(char par1, int par2) { if (par2 == * TControls.armorKey.keyCode) { this.mc.thePlayer.closeScreen(); } - * + * * super.keyTyped(par1, par2); } */ } diff --git a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java index 24b87c50860..1c365845ffc 100644 --- a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java @@ -6,13 +6,11 @@ import tconstruct.armor.player.ArmorExtended; import tconstruct.smeltery.inventory.ActiveContainer; -public class ArmorExtendedContainer extends ActiveContainer -{ +public class ArmorExtendedContainer extends ActiveContainer { public InventoryPlayer invPlayer; public ArmorExtended armor; - public ArmorExtendedContainer(InventoryPlayer inventoryplayer, ArmorExtended armor) - { + public ArmorExtendedContainer(InventoryPlayer inventoryplayer, ArmorExtended armor) { invPlayer = inventoryplayer; this.armor = armor; @@ -20,40 +18,40 @@ public ArmorExtendedContainer(InventoryPlayer inventoryplayer, ArmorExtended arm this.addSlotToContainer(new SlotAccessory(armor, 1, 80, 35, 1)); this.addSlotToContainer(new SlotAccessory(armor, 2, 116, 17, 1)); this.addSlotToContainer(new SlotAccessory(armor, 3, 116, 35, 1)); - + // HeartCanister this.addSlotToContainer(new SlotAccessory(armor, 4, 152, 53, 10)); this.addSlotToContainer(new SlotAccessory(armor, 5, 152, 35, 10)); this.addSlotToContainer(new SlotAccessory(armor, 6, 152, 17, 10)); - for (int playerArmor = 0; playerArmor < 4; ++playerArmor) - { - this.addSlotToContainer(new SlotArmorCopy(this, inventoryplayer, inventoryplayer.getSizeInventory() - 1 - playerArmor, 98, 8 + playerArmor * 18, playerArmor)); + for (int playerArmor = 0; playerArmor < 4; ++playerArmor) { + this.addSlotToContainer(new SlotArmorCopy( + this, + inventoryplayer, + inventoryplayer.getSizeInventory() - 1 - playerArmor, + 98, + 8 + playerArmor * 18, + playerArmor)); } - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); } - } @Override - public boolean canInteractWith (EntityPlayer var1) - { + public boolean canInteractWith(EntityPlayer var1) { return true; } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { return null; } } diff --git a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java index 5ac78bde810..40816021546 100644 --- a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java @@ -5,74 +5,58 @@ import net.minecraft.item.ItemStack; import tconstruct.armor.player.KnapsackInventory; -public class KnapsackContainer extends Container -{ +public class KnapsackContainer extends Container { public KnapsackInventory backpack; public int progress = 0; public int fuel = 0; public int fuelGague = 0; - public KnapsackContainer(InventoryPlayer inventoryplayer, KnapsackInventory knapsack) - { + public KnapsackContainer(InventoryPlayer inventoryplayer, KnapsackInventory knapsack) { backpack = knapsack; - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { this.addSlotToContainer(new Slot(knapsack, row + column * 9, 8 + row * 18, 17 + column * 18)); } } /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); } } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { return backpack.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < backpack.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, backpack.getSizeInventory(), this.inventorySlots.size(), true)) - { + if (slotID < backpack.getSizeInventory()) { + if (!this.mergeItemStack(slotStack, backpack.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(slotStack, 0, backpack.getSizeInventory(), false)) - { + } else if (!this.mergeItemStack(slotStack, 0, backpack.getSizeInventory(), false)) { return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java index e580ae8e1ce..51bef493c7d 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java +++ b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java @@ -4,13 +4,11 @@ import net.minecraft.item.*; import tconstruct.library.accessory.IAccessory; -public class SlotAccessory extends Slot -{ +public class SlotAccessory extends Slot { private final int slotID; private final int slotStackLimit; - public SlotAccessory(IInventory par2IInventory, int par3, int par4, int par5, int slotStackLimit) - { + public SlotAccessory(IInventory par2IInventory, int par3, int par4, int par5, int slotStackLimit) { super(par2IInventory, par3, par4, par5); this.slotID = par3; this.slotStackLimit = slotStackLimit; @@ -20,17 +18,17 @@ public SlotAccessory(IInventory par2IInventory, int par3, int par4, int par5, in * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case * of armor slots) */ - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return slotStackLimit; } /** * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); - return item != null && (item instanceof IAccessory) && ((IAccessory) item).canEquipAccessory(par1ItemStack, this.slotID); + return item != null + && (item instanceof IAccessory) + && ((IAccessory) item).canEquipAccessory(par1ItemStack, this.slotID); } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java index c0ad06890fd..9dc58493b4a 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java +++ b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java @@ -5,8 +5,7 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; -public class SlotArmorCopy extends Slot -{ +public class SlotArmorCopy extends Slot { /** * The armor type that can be placed on that slot, it uses the same values * of armorType field on ItemArmor. @@ -19,8 +18,7 @@ public class SlotArmorCopy extends Slot */ final Container parent; - public SlotArmorCopy(Container container, IInventory par2IInventory, int par3, int par4, int par5, int par6) - { + public SlotArmorCopy(Container container, IInventory par2IInventory, int par3, int par4, int par5, int par6) { super(par2IInventory, par3, par4, par5); this.parent = container; this.armorType = par6; @@ -31,8 +29,7 @@ public SlotArmorCopy(Container container, IInventory par2IInventory, int par3, i * getInventoryStackLimit(), but 1 in the case of armor slots) */ @Override - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return 1; } @@ -41,12 +38,10 @@ public int getSlotStackLimit () * the armor slots. */ @Override - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); boolean isValidArmor = false; - if (item instanceof ItemArmor) - { + if (item instanceof ItemArmor) { isValidArmor = (((ItemArmor) item).armorType == armorType); } return item != null && (isValidArmor || (item instanceof ItemBlock && armorType == 0)); @@ -57,8 +52,7 @@ public boolean isItemValid (ItemStack par1ItemStack) /** * Returns the icon index on items.png that is used as background image of the slot. */ - public IIcon getBackgroundIconIndex () - { + public IIcon getBackgroundIconIndex() { return ItemArmor.func_94602_b(this.armorType); } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java index 1f2c993f5d6..10bfc69e981 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java @@ -4,36 +4,30 @@ import net.minecraft.item.ItemStack; import tconstruct.mechworks.landmine.behavior.Behavior; -public class SlotBehavedOnly extends Slot -{ +public class SlotBehavedOnly extends Slot { - public SlotBehavedOnly(IInventory par1iInventory, int par2, int par3, int par4) - { + public SlotBehavedOnly(IInventory par1iInventory, int par2, int par3, int par4) { super(par1iInventory, par2, par3, par4); } @Override - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); - if (b == null) - { + if (b == null) { return false; } int stackL = b.getStackLimit(par1ItemStack); - if (b != null && this.inventory.getStackInSlot(this.slotNumber) != null && !this.inventory.getStackInSlot(this.slotNumber).isItemEqual(par1ItemStack)) - { + if (b != null + && this.inventory.getStackInSlot(this.slotNumber) != null + && !this.inventory.getStackInSlot(this.slotNumber).isItemEqual(par1ItemStack)) { ItemStack is = this.inventory.getStackInSlot(this.slotNumber); - if (is.stackSize + par1ItemStack.stackSize <= stackL) - { + if (is.stackSize + par1ItemStack.stackSize <= stackL) { return true; } - } - else - { + } else { return par1ItemStack.stackSize <= stackL; } @@ -41,8 +35,9 @@ public boolean isItemValid (ItemStack par1ItemStack) // return b != null; } - public int getSlotStackLimit (ItemStack par1ItemStack) - { - return Behavior.getBehaviorFromStack(par1ItemStack) != null ? Behavior.getBehaviorFromStack(par1ItemStack).getStackLimit(par1ItemStack) : 1; + public int getSlotStackLimit(ItemStack par1ItemStack) { + return Behavior.getBehaviorFromStack(par1ItemStack) != null + ? Behavior.getBehaviorFromStack(par1ItemStack).getStackLimit(par1ItemStack) + : 1; } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java index 4afdcc94ee1..e426cb96b1a 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java @@ -4,28 +4,23 @@ import net.minecraft.item.*; /** - * + * * @author fuj1n - * + * */ -public class SlotBlocksOnly extends Slot -{ +public class SlotBlocksOnly extends Slot { - public SlotBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) - { + public SlotBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) { super(par1iInventory, par2, par3, par4); } @Override - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { return par1ItemStack.getItem() instanceof ItemBlock; } @Override - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return 1; } - } diff --git a/src/main/java/tconstruct/armor/inventory/SlotCanister.java b/src/main/java/tconstruct/armor/inventory/SlotCanister.java index 8b4cd1c1a03..c7c7ebcc6ee 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/armor/inventory/SlotCanister.java @@ -4,12 +4,10 @@ import net.minecraft.item.*; import tconstruct.library.accessory.IHealthAccessory; -public class SlotCanister extends Slot -{ +public class SlotCanister extends Slot { private final int slotID; - public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5) - { + public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); this.slotID = par3; } @@ -19,8 +17,7 @@ public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5) * getInventoryStackLimit(), but 1 in the case of armor slots) */ @Override - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return 10; } @@ -29,10 +26,10 @@ public int getSlotStackLimit () * the armor slots. */ @Override - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); - return item != null && (item instanceof IHealthAccessory) && ((IHealthAccessory) item).canEquipAccessory(par1ItemStack, this.slotID); - + return item != null + && (item instanceof IHealthAccessory) + && ((IHealthAccessory) item).canEquipAccessory(par1ItemStack, this.slotID); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java index 275811a7375..53bbc5f6bfd 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java @@ -4,10 +4,8 @@ import net.minecraft.item.*; import tconstruct.armor.items.Knapsack; -public class SlotKnapsack extends Slot -{ - public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5) - { +public class SlotKnapsack extends Slot { + public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); } @@ -16,8 +14,7 @@ public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5) * getInventoryStackLimit(), but 1 in the case of armor slots) */ @Override - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return 1; } @@ -26,9 +23,8 @@ public int getSlotStackLimit () * the armor slots. */ @Override - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); return item != null && (item instanceof Knapsack); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java index 685c0f2ee80..2648451dabf 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java @@ -3,11 +3,9 @@ import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -public class SlotOnlyTake extends Slot -{ +public class SlotOnlyTake extends Slot { - public SlotOnlyTake(IInventory builder, int par3, int par4, int par5) - { + public SlotOnlyTake(IInventory builder, int par3, int par4, int par5) { super(builder, par3, par4, par5); } @@ -16,8 +14,7 @@ public SlotOnlyTake(IInventory builder, int par3, int par4, int par5) * the armor slots. */ @Override - public boolean isItemValid (ItemStack stack) - { + public boolean isItemValid(ItemStack stack) { return false; } } diff --git a/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java index ea0b7209870..b6e4ee7ac53 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java @@ -6,23 +6,19 @@ import net.minecraft.item.ItemStack; /** - * + * * @author fuj1n - * + * */ -public class SlotOpaqueBlocksOnly extends SlotBlocksOnly -{ +public class SlotOpaqueBlocksOnly extends SlotBlocksOnly { - public SlotOpaqueBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) - { + public SlotOpaqueBlocksOnly(IInventory par1iInventory, int par2, int par3, int par4) { super(par1iInventory, par2, par3, par4); } @Override - public boolean isItemValid (ItemStack par1ItemStack) - { - if (super.isItemValid(par1ItemStack)) - { + public boolean isItemValid(ItemStack par1ItemStack) { + if (super.isItemValid(par1ItemStack)) { Block b = BlockUtils.getBlockFromItemStack(par1ItemStack); return b.isOpaqueCube() && b.renderAsNormalBlock(); } @@ -31,9 +27,7 @@ public boolean isItemValid (ItemStack par1ItemStack) } @Override - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return 1; } - } diff --git a/src/main/java/tconstruct/armor/inventory/SlotUnused.java b/src/main/java/tconstruct/armor/inventory/SlotUnused.java index d6b396b0a5d..14886b50ada 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotUnused.java +++ b/src/main/java/tconstruct/armor/inventory/SlotUnused.java @@ -3,10 +3,8 @@ import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -public class SlotUnused extends Slot -{ - public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5) - { +public class SlotUnused extends Slot { + public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); } @@ -15,8 +13,7 @@ public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5) * getInventoryStackLimit(), but 1 in the case of armor slots) */ @Override - public int getSlotStackLimit () - { + public int getSlotStackLimit() { return 0; } @@ -25,8 +22,7 @@ public int getSlotStackLimit () * the armor slots. */ @Override - public boolean isItemValid (ItemStack par1ItemStack) - { + public boolean isItemValid(ItemStack par1ItemStack) { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/armor/items/ArmorBasic.java b/src/main/java/tconstruct/armor/items/ArmorBasic.java index 97e90c05291..08cace29cfd 100644 --- a/src/main/java/tconstruct/armor/items/ArmorBasic.java +++ b/src/main/java/tconstruct/armor/items/ArmorBasic.java @@ -4,28 +4,28 @@ import net.minecraft.entity.Entity; import net.minecraft.item.*; -public class ArmorBasic extends ItemArmor -{ +public class ArmorBasic extends ItemArmor { public String textureName; - public ArmorBasic(ArmorMaterial par2EnumArmorMaterial, int par3, String textureName) - { + public ArmorBasic(ArmorMaterial par2EnumArmorMaterial, int par3, String textureName) { super(par2EnumArmorMaterial, 0, par3); this.textureName = textureName; } @Override - public void registerIcons (IIconRegister par1IconRegister) - { - this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); + public void registerIcons(IIconRegister par1IconRegister) { + this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" + + (this.armorType == 0 + ? "helmet" + : this.armorType == 1 + ? "chestplate" + : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); } @Override - public String getArmorTexture (ItemStack stack, Entity entity, int slot, String type) - { + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { int suffix = this.armorType == 2 ? 2 : 1; return "tinker:textures/armor/" + textureName + "_" + suffix + ".png"; } - } diff --git a/src/main/java/tconstruct/armor/items/ArmorPattern.java b/src/main/java/tconstruct/armor/items/ArmorPattern.java index ad9dcc6cbee..ceeac537886 100644 --- a/src/main/java/tconstruct/armor/items/ArmorPattern.java +++ b/src/main/java/tconstruct/armor/items/ArmorPattern.java @@ -9,13 +9,11 @@ import net.minecraft.util.IIcon; import tconstruct.library.*; -public class ArmorPattern extends CraftingItem implements ItemBlocklike -{ +public class ArmorPattern extends CraftingItem implements ItemBlocklike { private IIcon baseIcon; - public ArmorPattern(int id, String patternType, String folder) - { + public ArmorPattern(int id, String patternType, String folder) { super(patternName, getPatternNames(patternType), folder, "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); @@ -23,36 +21,29 @@ public ArmorPattern(int id, String patternType, String folder) this.setMaxStackSize(1); } - protected static String[] getPatternNames (String partType) - { + protected static String[] getPatternNames(String partType) { String[] names = new String[patternName.length]; - for (int i = 0; i < patternName.length; i++) - names[i] = partType + patternName[i]; + for (int i = 0; i < patternName.length; i++) names[i] = partType + patternName[i]; return names; } - public IIcon getBaseIcon () - { + public IIcon getBaseIcon() { return baseIcon; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); baseIcon = iconRegister.registerIcon("tinker:" + folder + "armor_cast"); } - private static final String[] patternName = new String[] { "helmet", "chestplate", "leggings", "boots" }; + private static final String[] patternName = new String[] {"helmet", "chestplate", "leggings", "boots"}; @Override - public void getSubItems (Item block, CreativeTabs tab, List list) - { - for (int i = 0; i < patternName.length; i++) - { + public void getSubItems(Item block, CreativeTabs tab, List list) { + for (int i = 0; i < patternName.length; i++) { list.add(new ItemStack(block, 1, i)); } } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/armor/items/DiamondApple.java b/src/main/java/tconstruct/armor/items/DiamondApple.java index a352196088e..bfbc18759be 100644 --- a/src/main/java/tconstruct/armor/items/DiamondApple.java +++ b/src/main/java/tconstruct/armor/items/DiamondApple.java @@ -8,14 +8,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class DiamondApple extends ItemFood -{ +public class DiamondApple extends ItemFood { public IIcon[] icons; - public String[] textureNames = new String[] { "food/apple_diamond" }; - public String[] itemNames = new String[] { "apple.diamond" }; + public String[] textureNames = new String[] {"food/apple_diamond"}; + public String[] itemNames = new String[] {"apple.diamond"}; - public DiamondApple() - { + public DiamondApple() { super(4, 2.0F, false); setHasSubtypes(true); setMaxDamage(0); @@ -23,58 +21,54 @@ public DiamondApple() } @Override - protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player) - { - if (!world.isRemote) - { + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + if (!world.isRemote) { int duration = 0; PotionEffect potion; potion = player.getActivePotionEffect(Potion.resistance); - if (potion != null) - duration = potion.getDuration(); + if (potion != null) duration = potion.getDuration(); player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, duration + 60 * 40, 4)); potion = player.getActivePotionEffect(Potion.resistance); - if (potion != null) - duration = potion.getDuration(); + if (potion != null) duration = potion.getDuration(); player.addPotionEffect(new PotionEffect(Potion.resistance.id, duration + 60 * 20, 0)); potion = player.getActivePotionEffect(Potion.digSpeed); - if (potion != null) - duration = potion.getDuration(); + if (potion != null) duration = potion.getDuration(); player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, duration + 60 * 20, 0)); potion = player.getActivePotionEffect(Potion.damageBoost); - if (potion != null) - duration = potion.getDuration(); + if (potion != null) duration = potion.getDuration(); player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, duration + 60 * 20, 0)); } } @SideOnly(Side.CLIENT) @Override - public IIcon getIconFromDamage (int meta) - { + public IIcon getIconFromDamage(int meta) { return icons[meta]; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } /* Name override */ @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("item.food.").append(itemNames[(itemstack.getItemDamage()>=itemNames.length||itemstack.getItemDamage()<0)?(0):(itemstack.getItemDamage())]).toString(); + public String getUnlocalizedName(ItemStack itemstack) { + return (new StringBuilder()) + .append("item.food.") + .append(itemNames[ + (itemstack.getItemDamage() >= itemNames.length || itemstack.getItemDamage() < 0) + ? (0) + : (itemstack.getItemDamage())]) + .toString(); } } diff --git a/src/main/java/tconstruct/armor/items/Glove.java b/src/main/java/tconstruct/armor/items/Glove.java index c2e38b6aff3..d15ab375071 100644 --- a/src/main/java/tconstruct/armor/items/Glove.java +++ b/src/main/java/tconstruct/armor/items/Glove.java @@ -4,17 +4,14 @@ import net.minecraft.item.Item; import tconstruct.library.TConstructRegistry; -public class Glove extends Item -{ - public Glove() - { +public class Glove extends Item { + public Glove() { super(); this.setCreativeTab(TConstructRegistry.materialTab); } @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { itemIcon = iconRegister.registerIcon("tinker:armor/dirthand"); } } diff --git a/src/main/java/tconstruct/armor/items/HeartCanister.java b/src/main/java/tconstruct/armor/items/HeartCanister.java index a6e1ff356d1..a74e379c1d3 100644 --- a/src/main/java/tconstruct/armor/items/HeartCanister.java +++ b/src/main/java/tconstruct/armor/items/HeartCanister.java @@ -11,37 +11,43 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IHealthAccessory; -public class HeartCanister extends CraftingItem implements IHealthAccessory -{ +public class HeartCanister extends CraftingItem implements IHealthAccessory { - public HeartCanister() - { - super(new String[] { "empty", "miniheart.red", "red", "miniheart.yellow", "yellow", "miniheart.green", "green" }, new String[] { "canister_empty", "miniheart_red", "canister_red", "miniheart_yellow", "canister_yellow", "miniheart_green", "canister_green" }, "", "tinker", TConstructRegistry.materialTab); + public HeartCanister() { + super( + new String[] {"empty", "miniheart.red", "red", "miniheart.yellow", "yellow", "miniheart.green", "green" + }, + new String[] { + "canister_empty", + "miniheart_red", + "canister_red", + "miniheart_yellow", + "canister_yellow", + "miniheart_green", + "canister_green" + }, + "", + "tinker", + TConstructRegistry.materialTab); this.setMaxStackSize(10); } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { int meta = stack.getItemDamage(); - if (meta == 1 || meta == 3 || meta == 5) - { + if (meta == 1 || meta == 3 || meta == 5) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } - if (!world.isRemote && meta == 2) - { + if (!world.isRemote && meta == 2) { TPlayerStats stats = TPlayerStats.get(player); - if (stats != null && stats.armor != null) - { + if (stats != null && stats.armor != null) { ArmorExtended armor = stats.armor; ItemStack slotStack = armor.getStackInSlot(6); - if (slotStack == null)// || slotStack.getItem() == this) + if (slotStack == null) // || slotStack.getItem() == this) { armor.setInventorySlotContents(6, new ItemStack(this, 1, 2)); stack.stackSize--; - } - else if (slotStack.getItem() == this && slotStack.stackSize < this.maxStackSize) - { + } else if (slotStack.getItem() == this && slotStack.stackSize < this.maxStackSize) { slotStack.stackSize++; stack.stackSize--; } @@ -52,8 +58,7 @@ else if (slotStack.getItem() == this && slotStack.stackSize < this.maxStackSize) } @Override - public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { int meta = stack.getItemDamage(); --stack.stackSize; player.heal((meta + 1) * 10); @@ -62,53 +67,44 @@ public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) } @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.eat; } - public int getMaxItemUseDuration (ItemStack par1ItemStack) - { + public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 32; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { int meta = stack.getItemDamage(); - if (meta == 0 || meta % 2 == 1) - list.add(StatCollector.translateToLocal("item.crafting.tooltip")); - else - { + if (meta == 0 || meta % 2 == 1) list.add(StatCollector.translateToLocal("item.crafting.tooltip")); + else { list.add(StatCollector.translateToLocal("item.accessory.tooltip")); list.add(StatCollector.translateToLocal("canister.tooltip")); } - switch (meta) - { - case 1: - list.add(StatCollector.translateToLocal("canister.red.tooltip1")); - list.add(StatCollector.translateToLocal("canister.red.tooltip2")); - break; - case 2: - list.add(StatCollector.translateToLocal("canister.green.tooltip1")); - list.add(StatCollector.translateToLocal("canister.green.tooltip2")); - break; + switch (meta) { + case 1: + list.add(StatCollector.translateToLocal("canister.red.tooltip1")); + list.add(StatCollector.translateToLocal("canister.red.tooltip2")); + break; + case 2: + list.add(StatCollector.translateToLocal("canister.green.tooltip1")); + list.add(StatCollector.translateToLocal("canister.green.tooltip2")); + break; } } @Override - public boolean canEquipAccessory (ItemStack item, int slot) - { + public boolean canEquipAccessory(ItemStack item, int slot) { int type = item.getItemDamage(); return ((type == 2 && slot == 6) || (type == 4 && slot == 5) || (type == 6 && slot == 4)); } @Override - public int getHealthBoost (ItemStack item) - { + public int getHealthBoost(ItemStack item) { return item.stackSize * 2; } - } diff --git a/src/main/java/tconstruct/armor/items/Jerky.java b/src/main/java/tconstruct/armor/items/Jerky.java index 04e1796bf72..06f0d49aa25 100644 --- a/src/main/java/tconstruct/armor/items/Jerky.java +++ b/src/main/java/tconstruct/armor/items/Jerky.java @@ -10,65 +10,65 @@ import net.minecraft.world.World; import tconstruct.world.items.SpecialFood; -public class Jerky extends SpecialFood -{ - public static String[] textureNames = new String[] { "beef", "chicken", "pork", "mutton", "fish", "monster", "blueslime", "blood" }; - public static String[] itemNames = new String[] { "jerky.beef", "jerky.chicken", "jerky.pig", "jerky.sheep", "jerky.fish", "jerky.zombie", "jerky.blueslime", "jerky.blood" }; - public static int[] hunger = new int[] { 8, 6, 8, 6, 5, 4, 6, 4 }; - public static float[] saturation = new float[] { 1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f, 1.0f, 0.4f }; - public static int[] overhaulHunger = new int[] { 1, 1, 1, 1, 1, 1, 1, 1 }; +public class Jerky extends SpecialFood { + public static String[] textureNames = + new String[] {"beef", "chicken", "pork", "mutton", "fish", "monster", "blueslime", "blood"}; + public static String[] itemNames = new String[] { + "jerky.beef", + "jerky.chicken", + "jerky.pig", + "jerky.sheep", + "jerky.fish", + "jerky.zombie", + "jerky.blueslime", + "jerky.blood" + }; + public static int[] hunger = new int[] {8, 6, 8, 6, 5, 4, 6, 4}; + public static float[] saturation = new float[] {1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f, 1.0f, 0.4f}; + public static int[] overhaulHunger = new int[] {1, 1, 1, 1, 1, 1, 1, 1}; - public Jerky(boolean hungerOverhaul) - { + public Jerky(boolean hungerOverhaul) { super(hungerOverhaul ? overhaulHunger : hunger, saturation, itemNames, textureNames); this.setHasSubtypes(true); } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.icons = new IIcon[iconNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:food/jerky_" + iconNames[i]); } } @Override - public String getUnlocalizedName (ItemStack stack) - { + public String getUnlocalizedName(ItemStack stack) { int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, unlocalizedNames.length); return "item.tconstruct." + unlocalizedNames[arr]; } @Override - protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player) - { - if (stack.getItemDamage() == 7) - { + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 7) { int duration = 0; PotionEffect potion = player.getActivePotionEffect(Potion.field_76434_w); - if (potion != null) - duration = potion.getDuration(); + if (potion != null) duration = potion.getDuration(); player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 60 * 60, 1)); } } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { int type = stack.getItemDamage(); - switch (type) - { - case 6: - list.add("\u00a7b" + StatCollector.translateToLocal("strangefood5.tooltip")); - break; - case 7: - list.add("\u00a74" + StatCollector.translateToLocal("strangefood6.tooltip")); - break; + switch (type) { + case 6: + list.add("\u00a7b" + StatCollector.translateToLocal("strangefood5.tooltip")); + break; + case 7: + list.add("\u00a74" + StatCollector.translateToLocal("strangefood6.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/armor/items/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java index 429d3dd9f37..b04cba546fa 100644 --- a/src/main/java/tconstruct/armor/items/Knapsack.java +++ b/src/main/java/tconstruct/armor/items/Knapsack.java @@ -9,30 +9,25 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; -public class Knapsack extends CraftingItem implements IAccessory -{ +public class Knapsack extends CraftingItem implements IAccessory { - public Knapsack() - { - super(new String[] { "knapsack" }, new String[] { "knapsack" }, "armor/", "tinker", TConstructRegistry.materialTab); + public Knapsack() { + super(new String[] {"knapsack"}, new String[] {"knapsack"}, "armor/", "tinker", TConstructRegistry.materialTab); this.setMaxStackSize(10); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 0: - list.add(StatCollector.translateToLocal("knapsack.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 0: + list.add(StatCollector.translateToLocal("knapsack.tooltip")); + break; } } @Override - public boolean canEquipAccessory (ItemStack item, int slot) - { + public boolean canEquipAccessory(ItemStack item, int slot) { return slot == 2; } @@ -42,7 +37,7 @@ public boolean canEquipAccessory (ItemStack item, int slot) * player, ItemStack itemStack) { TPlayerStats stats = * TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); * KnapsackInventory inv = stats.knapsack; - * + * * if (stats != null && inv != null) { for (int i = 0; i < * inv.getSizeInventory(); i++) { if (inv.getStackInSlot(i) != null) { * inv.getStackInSlot(i).getItem().onUpdate(inv.getStackInSlot(i), diff --git a/src/main/java/tconstruct/armor/items/TArmorBase.java b/src/main/java/tconstruct/armor/items/TArmorBase.java index c9f8d47064c..b6bd8d69346 100644 --- a/src/main/java/tconstruct/armor/items/TArmorBase.java +++ b/src/main/java/tconstruct/armor/items/TArmorBase.java @@ -14,13 +14,12 @@ public class TArmorBase extends ItemArmor // implements ISpecialArmor { IIcon[] icons; - String[] iconNames = { "wood_boots" }; + String[] iconNames = {"wood_boots"}; // static Minecraft mc = Minecraft.getMinecraft(); // private ModelBiped modelArmor; - public TArmorBase(int armorSlot) - { + public TArmorBase(int armorSlot) { super(ArmorMaterial.CLOTH, 0, armorSlot); this.maxStackSize = 1; this.setMaxDamage(100); @@ -31,18 +30,15 @@ public TArmorBase(int armorSlot) // this.setCreativeTab(TConstructRegistry.toolTab); } - public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack) - { - - } + public void onArmorTickUpdate(World world, EntityPlayer player, ItemStack itemStack) {} /** * Called by RenderBiped and RenderPlayer to determine the armor texture * that should be use for the currently equiped item. This will only be * called on instances of ItemArmor. - * + * * Returning null from this function will use the default value. - * + * * @param stack * ItemStack for the equpt armor * @param entity @@ -56,52 +52,46 @@ public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemS */ @Override @SideOnly(Side.CLIENT) - public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer) - { + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layer) { return "/mods/tinker/textures/armor/wood_1.png"; } /** * Override this method to have an item handle its own armor rendering. - * + * * @param entityLiving * The entity wearing the armor * @param itemStack * The itemStack to render the model of * @param armorSlot * 0=head, 1=torso, 2=legs, 3=feet - * + * * @return A ModelBiped to render instead of the default */ @Override @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel (EntityLivingBase par1EntityLiving, ItemStack itemStack, int armorSlot) - { + public ModelBiped getArmorModel(EntityLivingBase par1EntityLiving, ItemStack itemStack, int armorSlot) { return null; } @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { + public boolean requiresMultipleRenderPasses() { return false; } @SideOnly(Side.CLIENT) @Override - public IIcon getIconFromDamage (int meta) - { + public IIcon getIconFromDamage(int meta) { return icons[0]; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.icons = new IIcon[iconNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:armor/" + iconNames[i]); } } @@ -110,14 +100,14 @@ public void registerIcons (IIconRegister iconRegister) * @Override public ArmorProperties getProperties (EntityLiving player, * ItemStack armor, DamageSource source, double damage, int slot) { // TODO * Auto-generated method stub return null; } - * + * * @Override public int getArmorDisplay (EntityPlayer player, ItemStack * armor, int slot) { // TODO Auto-generated method stub return 0; } - * + * * @Override public void damageArmor (EntityLiving entity, ItemStack stack, * DamageSource source, int damage, int slot) { // TODO Auto-generated * method stub - * + * * } */ } diff --git a/src/main/java/tconstruct/armor/items/TravelBelt.java b/src/main/java/tconstruct/armor/items/TravelBelt.java index 315840ec04e..e5d23679841 100644 --- a/src/main/java/tconstruct/armor/items/TravelBelt.java +++ b/src/main/java/tconstruct/armor/items/TravelBelt.java @@ -14,29 +14,23 @@ import tconstruct.client.ArmorControls; import tconstruct.library.accessory.*; -public class TravelBelt extends AccessoryCore implements IAccessoryModel -{ - public TravelBelt() - { +public class TravelBelt extends AccessoryCore implements IAccessoryModel { + public TravelBelt() { super("travelgear/travel_belt"); } @Override - public boolean canEquipAccessory (ItemStack item, int slot) - { + public boolean canEquipAccessory(ItemStack item, int slot) { return slot == 3; } @Override @SideOnly(Side.CLIENT) - protected void registerModifiers (IIconRegister iconRegister) - { - } + protected void registerModifiers(IIconRegister iconRegister) {} @Override @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) - { + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { return ArmorProxyClient.belt; } @@ -44,19 +38,17 @@ public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemSt @Override @SideOnly(Side.CLIENT) - public ResourceLocation getWearbleTexture (Entity entity, ItemStack stack, int slot) - { + public ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot) { return texture; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (!stack.hasTagCompound()) return; list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.ability")); - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.control") + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.control") + + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); } } diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java index 00b26876fbf..a8845455a9b 100644 --- a/src/main/java/tconstruct/armor/items/TravelGear.java +++ b/src/main/java/tconstruct/armor/items/TravelGear.java @@ -23,48 +23,35 @@ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer"), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles") }) -public class TravelGear extends ArmorCore implements IRevealer, IGoggles -{ +public class TravelGear extends ArmorCore implements IRevealer, IGoggles { - public TravelGear(ArmorPart part) - { + public TravelGear(ArmorPart part) { super(0, part, "Clothing", "travelgear", "travel"); this.setMaxDamage(1035); } @Override - public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack) - { + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { super.onArmorTick(world, player, itemStack); - if (armorPart == ArmorPart.Chest) - { - if (player.isInWater()) - { + if (armorPart == ArmorPart.Chest) { + if (player.isInWater()) { player.motionX *= 1.2D; - if (player.motionY > 0.0D) - { + if (player.motionY > 0.0D) { player.motionY *= 1.2D; } player.motionZ *= 1.2D; double maxSpeed = 0.2D; - if (player.motionX > maxSpeed) - { + if (player.motionX > maxSpeed) { player.motionX = maxSpeed; - } - else if (player.motionX < -maxSpeed) - { + } else if (player.motionX < -maxSpeed) { player.motionX = -maxSpeed; } - if (player.motionY > maxSpeed) - { + if (player.motionY > maxSpeed) { player.motionY = maxSpeed; } - if (player.motionZ > maxSpeed) - { + if (player.motionZ > maxSpeed) { player.motionZ = maxSpeed; - } - else if (player.motionZ < -maxSpeed) - { + } else if (player.motionZ < -maxSpeed) { player.motionZ = -maxSpeed; } } @@ -72,129 +59,129 @@ else if (player.motionZ < -maxSpeed) } @Override - protected double getBaseDefense () - { - switch (armorPart) - { - case Head: - return 0; - case Chest: - return 4; - case Legs: - return 2; - case Feet: - return 2; + protected double getBaseDefense() { + switch (armorPart) { + case Head: + return 0; + case Chest: + return 4; + case Legs: + return 2; + case Feet: + return 2; } return 0; } @Override - protected double getMaxDefense () - { - switch (armorPart) - { - case Head: - return 4; - case Chest: - return 10; - case Legs: - return 8; - case Feet: - return 6; + protected double getMaxDefense() { + switch (armorPart) { + case Head: + return 4; + case Chest: + return 10; + case Legs: + return 8; + case Feet: + return 6; } return 0; } @Override - protected int getDurability () - { + protected int getDurability() { return 1035; } - //Temporary? - public ItemStack getRepairMaterial (ItemStack input) - { + // Temporary? + public ItemStack getRepairMaterial(ItemStack input) { return new ItemStack(Items.leather); } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_" + (this.armorType == 0 ? "goggles" : this.armorType == 1 ? "vest" : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet")); + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_" + + (this.armorType == 0 + ? "goggles" + : this.armorType == 1 + ? "vest" + : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet")); registerModifiers(iconRegister); } @Override @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) - { - if (armorSlot == 1) - return ArmorProxyClient.vest; - if (armorSlot == 2) - return ArmorProxyClient.wings; - if (armorSlot == 3) - return ArmorProxyClient.bootbump; + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + if (armorSlot == 1) return ArmorProxyClient.vest; + if (armorSlot == 2) return ArmorProxyClient.wings; + if (armorSlot == 3) return ArmorProxyClient.bootbump; return null; } @Override @SideOnly(Side.CLIENT) - protected void registerModifiers (IIconRegister iconRegister) //temporary - { - switch (armorType) - { - case 0: - modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic1"); - modifiers[2] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic2"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "moss"); - break; - case 1: - modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "dodge"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "stealth"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "moss"); - break; - case 2: - modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss"); - break; - case 3: - modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "waterwalk"); - modifiers[2] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight"); - modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "slimysole"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "moss"); - break; + protected void registerModifiers(IIconRegister iconRegister) // temporary + { + switch (armorType) { + case 0: + modifiers = new IIcon[5]; + modifiers[0] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision"); + modifiers[1] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic1"); + modifiers[2] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "thaumic2"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "moss"); + break; + case 1: + modifiers = new IIcon[5]; + modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "dodge"); + modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "stealth"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "moss"); + break; + case 2: + modifiers = new IIcon[5]; + modifiers[0] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); + modifiers[1] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss"); + break; + case 3: + modifiers = new IIcon[5]; + modifiers[0] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump"); + modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "waterwalk"); + modifiers[2] = + iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight"); + modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "slimysole"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "moss"); + break; } } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - - switch (armorPart) - { - case Head: - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability") + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode())); - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities") + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode())); - break; - case Chest: - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelvest.ability")); - break; - case Legs: - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelwings.ability")); - break; - case Feet: - list.add("\u00a76" + StatCollector.translateToLocal("armor.travelboots.ability")); - break; - default: + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + + switch (armorPart) { + case Head: + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability") + + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode())); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities") + + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode())); + break; + case Chest: + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelvest.ability")); + break; + case Legs: + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelwings.ability")); + break; + case Feet: + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelboots.ability")); + break; + default: } super.addInformation(stack, player, list, par4); @@ -203,7 +190,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo @Optional.Method(modid = "Thaumcraft") @Override public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { - if(itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles) + if (itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles) return false; return itemstack.getTagCompound().getCompoundTag(this.getBaseTagName()).getBoolean("Thaumic Senses"); @@ -212,7 +199,7 @@ public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { @Optional.Method(modid = "Thaumcraft") @Override public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { - if(itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles) + if (itemstack == null || !itemstack.hasTagCompound() || itemstack.getItem() != TinkerArmor.travelGoggles) return false; return itemstack.getTagCompound().getCompoundTag(this.getBaseTagName()).getBoolean("Thaumic Vision"); diff --git a/src/main/java/tconstruct/armor/items/TravelGlove.java b/src/main/java/tconstruct/armor/items/TravelGlove.java index a60bd120c60..465233c8b0e 100644 --- a/src/main/java/tconstruct/armor/items/TravelGlove.java +++ b/src/main/java/tconstruct/armor/items/TravelGlove.java @@ -9,23 +9,19 @@ import tconstruct.armor.ArmorProxyClient; import tconstruct.library.accessory.*; -public class TravelGlove extends AccessoryCore implements IAccessoryModel -{ - public TravelGlove() - { +public class TravelGlove extends AccessoryCore implements IAccessoryModel { + public TravelGlove() { super("travelgear/travel_glove"); } @Override - public boolean canEquipAccessory (ItemStack item, int slot) - { + public boolean canEquipAccessory(ItemStack item, int slot) { return slot == 1; } @Override @SideOnly(Side.CLIENT) - protected void registerModifiers (IIconRegister iconRegister) - { + protected void registerModifiers(IIconRegister iconRegister) { this.modifiers = new IIcon[4]; this.modifiers[0] = iconRegister.registerIcon("tinker:travelgear/glove_guard"); this.modifiers[1] = iconRegister.registerIcon("tinker:travelgear/glove_speedaura"); @@ -34,8 +30,7 @@ protected void registerModifiers (IIconRegister iconRegister) } @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) - { + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { return ArmorProxyClient.glove; } @@ -43,13 +38,12 @@ public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemSt @Override @SideOnly(Side.CLIENT) - public ResourceLocation getWearbleTexture (Entity entity, ItemStack stack, int slot) - { + public ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot) { return texture; } @Override public String[] getTraits() { - return new String[] { "accessory", "glove" }; + return new String[] {"accessory", "glove"}; } } diff --git a/src/main/java/tconstruct/armor/items/TravelWings.java b/src/main/java/tconstruct/armor/items/TravelWings.java index bafe452a04b..eedd1b0c155 100644 --- a/src/main/java/tconstruct/armor/items/TravelWings.java +++ b/src/main/java/tconstruct/armor/items/TravelWings.java @@ -1,5 +1,7 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -9,21 +11,16 @@ import net.minecraft.world.World; import tconstruct.library.armor.ArmorPart; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -public class TravelWings extends TravelGear -{ +public class TravelWings extends TravelGear { - public TravelWings() - { + public TravelWings() { super(ArmorPart.Legs); } @Override @SideOnly(Side.CLIENT) - protected void registerModifiers (IIconRegister IIconRegister) - { + protected void registerModifiers(IIconRegister IIconRegister) { String base = "tinker:armor/travel_wings_"; modifiers = new IIcon[5]; modifiers[0] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); @@ -36,26 +33,19 @@ protected void registerModifiers (IIconRegister IIconRegister) } @Override - public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack) - { + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { super.onArmorTick(world, player, itemStack); - if (itemStack.hasTagCompound()) - { + if (itemStack.hasTagCompound()) { NBTTagCompound tag = itemStack.getTagCompound().getCompoundTag(getBaseTagName()); int feather = tag.getInteger("Feather Fall"); - if (feather > 0) - { - if (player.fallDistance > 2.5) - player.fallDistance = 2.5f; + if (feather > 0) { + if (player.fallDistance > 2.5) player.fallDistance = 2.5f; float terminalVelocity = -0.4f + (feather * 0.08f); - if (terminalVelocity > -0.05f) - terminalVelocity = -0.05f; - if (player.isSneaking() && terminalVelocity > -0.8f) - terminalVelocity = -0.8F; + if (terminalVelocity > -0.05f) terminalVelocity = -0.05f; + if (player.isSneaking() && terminalVelocity > -0.8f) terminalVelocity = -0.8F; boolean flying = false; flying = player.capabilities.isFlying; - if (!flying && player.motionY < terminalVelocity) - { + if (!flying && player.motionY < terminalVelocity) { player.motionY = terminalVelocity; } } @@ -64,14 +54,12 @@ public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack) @Override @SideOnly(Side.CLIENT) - public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer) - { + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layer) { return "tinker:textures/armor/travel_wings.png"; } @Override - public ItemStack getRepairMaterial (ItemStack input) - { + public ItemStack getRepairMaterial(ItemStack input) { return new ItemStack(TinkerTools.materials, 1, 13); } } diff --git a/src/main/java/tconstruct/armor/model/BeltModel.java b/src/main/java/tconstruct/armor/model/BeltModel.java index 4b21f07f655..c9011e542fb 100644 --- a/src/main/java/tconstruct/armor/model/BeltModel.java +++ b/src/main/java/tconstruct/armor/model/BeltModel.java @@ -3,8 +3,7 @@ import net.minecraft.client.model.*; import net.minecraft.entity.Entity; -public class BeltModel extends ModelBiped -{ +public class BeltModel extends ModelBiped { ModelRenderer Buckle; ModelRenderer FrontRight; ModelRenderer FrontLeft; @@ -12,8 +11,7 @@ public class BeltModel extends ModelBiped ModelRenderer SideLeft; ModelRenderer Back; - public BeltModel() - { + public BeltModel() { textureWidth = 64; textureHeight = 32; @@ -54,12 +52,11 @@ public BeltModel() bipedBody.addChild(Back); } - public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - //super.render(entity, f, f1, f2, f3, f4, f5); + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + // super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); bipedBody.render(f5); - //Buckle.render(f5); + // Buckle.render(f5); /*FrontRight.render(f5); FrontLeft.render(f5); SideRight.render(f5); @@ -67,17 +64,14 @@ public void render (Entity entity, float f, float f1, float f2, float f3, float Back.render(f5);*/ } - private void setRotation (ModelRenderer model, float x, float y, float z) - { + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } @Override - public void setRotationAngles (float f, float f1, float partialTick, float f3, float f4, float f5, Entity player) - { + public void setRotationAngles(float f, float f1, float partialTick, float f3, float f4, float f5, Entity player) { super.setRotationAngles(f, f1, partialTick, f3, f4, f5, player); } - } diff --git a/src/main/java/tconstruct/armor/model/BootBump.java b/src/main/java/tconstruct/armor/model/BootBump.java index 90bafeccf57..8d808d3763c 100644 --- a/src/main/java/tconstruct/armor/model/BootBump.java +++ b/src/main/java/tconstruct/armor/model/BootBump.java @@ -2,13 +2,11 @@ import net.minecraft.client.model.*; -public class BootBump extends ModelBiped -{ +public class BootBump extends ModelBiped { ModelRenderer rightBump; ModelRenderer leftBump; - public BootBump() - { + public BootBump() { super(0.5f, 0, 64, 32); rightBump = new ModelRenderer(this, 24, 0); diff --git a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java index 067eb25bbb3..033031b2cda 100644 --- a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java +++ b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java @@ -2,36 +2,34 @@ import net.minecraft.client.model.ModelBiped; -public class HiddenPlayerModel extends ModelBiped -{ - public HiddenPlayerModel(float size, int slot) - { +public class HiddenPlayerModel extends ModelBiped { + public HiddenPlayerModel(float size, int slot) { super(size, 0, 64, 32); - if (slot != 0) //Head + if (slot != 0) // Head { this.bipedHead.isHidden = true; this.bipedHeadwear.isHidden = true; } - if (slot != 1 && slot != 5) //Chest, belt + if (slot != 1 && slot != 5) // Chest, belt { this.bipedBody.isHidden = true; } - if (slot != 2 && slot != 3) //Legs, shoes + if (slot != 2 && slot != 3) // Legs, shoes { this.bipedRightLeg.isHidden = true; this.bipedLeftLeg.isHidden = true; } - if (slot != 4) //Gloves + if (slot != 4) // Gloves { this.bipedRightArm.isHidden = true; this.bipedLeftArm.isHidden = true; } - if (slot != 6) //Ears + if (slot != 6) // Ears { this.bipedEars.isHidden = true; } - if (slot != 7) //Cloak + if (slot != 7) // Cloak { this.bipedCloak.isHidden = true; } diff --git a/src/main/java/tconstruct/armor/model/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java index f6fdda6d566..b37dac10353 100644 --- a/src/main/java/tconstruct/armor/model/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -12,60 +12,56 @@ import org.lwjgl.opengl.GL11; import tconstruct.armor.items.ArmorPattern; -public class RenderArmorCast implements IItemRenderer -{ +public class RenderArmorCast implements IItemRenderer { @Override - public boolean handleRenderType (ItemStack item, ItemRenderType type) - { + public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type != ItemRenderType.FIRST_PERSON_MAP; } @Override - public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { - switch (helper) - { - case BLOCK_3D: - return true; - case ENTITY_BOBBING: - return true; - case ENTITY_ROTATION: - return true; - case EQUIPPED_BLOCK: - return true; - case INVENTORY_BLOCK: - return true; - default: - return false; + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + switch (helper) { + case BLOCK_3D: + return true; + case ENTITY_BOBBING: + return true; + case ENTITY_ROTATION: + return true; + case EQUIPPED_BLOCK: + return true; + case INVENTORY_BLOCK: + return true; + default: + return false; } } @Override - public void renderItem (ItemRenderType type, ItemStack item, Object... data) - { + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.renderBlocksRg; Tessellator tessellator = Tessellator.instance; - IIcon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex(); + IIcon baseIcon = item.getItem() instanceof ArmorPattern + ? ((ArmorPattern) item.getItem()).getBaseIcon() + : item.getIconIndex(); GL11.glPushMatrix(); - switch (type) - { - case ENTITY: - GL11.glScalef(0.8F, 0.33F, 0.8F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - break; - case INVENTORY: - GL11.glScalef(1F, 0.6F, 1F); - GL11.glTranslatef(0F, -0.1F, 0F); - break; - case EQUIPPED: - GL11.glScalef(1F, 0.6F, 1F); - break; - case EQUIPPED_FIRST_PERSON: - GL11.glScalef(1F, 0.6F, 1F); - break; - default: - break; + switch (type) { + case ENTITY: + GL11.glScalef(0.8F, 0.33F, 0.8F); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + break; + case INVENTORY: + GL11.glScalef(1F, 0.6F, 1F); + GL11.glTranslatef(0F, -0.1F, 0F); + break; + case EQUIPPED: + GL11.glScalef(1F, 0.6F, 1F); + break; + case EQUIPPED_FIRST_PERSON: + GL11.glScalef(1F, 0.6F, 1F); + break; + default: + break; } renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F); renderCube(tessellator, renderer, baseIcon); @@ -81,8 +77,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) GL11.glPopMatrix(); } - public void renderCube (Tessellator tessellator, RenderBlocks renderer, IIcon icon) - { + public void renderCube(Tessellator tessellator, RenderBlocks renderer, IIcon icon) { tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); @@ -99,37 +94,29 @@ public void renderCube (Tessellator tessellator, RenderBlocks renderer, IIcon ic tessellator.draw(); } - public void renderSelectedCube (Tessellator tessellator, RenderBlocks renderer, IIcon icon, List sidesToRender) - { + public void renderSelectedCube( + Tessellator tessellator, RenderBlocks renderer, IIcon icon, List sidesToRender) { tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); - if (sidesToRender.contains(ForgeDirection.WEST)) - renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.WEST)) renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(1F, 0F, 0F); - if (sidesToRender.contains(ForgeDirection.EAST)) - renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.EAST)) renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, -1F, 0F); - if (sidesToRender.contains(ForgeDirection.DOWN)) - renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.DOWN)) renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 1F, 0F); - if (sidesToRender.contains(ForgeDirection.UP)) - renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.UP)) renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, -1F); - if (sidesToRender.contains(ForgeDirection.SOUTH)) - renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.SOUTH)) renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, 1F); - if (sidesToRender.contains(ForgeDirection.NORTH)) - renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.NORTH)) renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon); tessellator.draw(); } - public void renderCastTop (ItemStack par1ItemStack, ItemRenderType type) - { + public void renderCastTop(ItemStack par1ItemStack, ItemRenderType type) { GL11.glPushMatrix(); IIcon icon = par1ItemStack.getIconIndex(); - if (icon == null) - { + if (icon == null) { GL11.glPopMatrix(); return; } @@ -158,8 +145,15 @@ public void renderCastTop (ItemStack par1ItemStack, ItemRenderType type) GL11.glPopMatrix(); } - public static void renderItemIn2D (Tessellator par0Tessellator, float par1, float par2, float par3, float par4, float par5, float par6, float par7) - { + public static void renderItemIn2D( + Tessellator par0Tessellator, + float par1, + float par2, + float par3, + float par4, + float par5, + float par6, + float par7) { par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, 0.0F, 1.0F); par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double) par1, (double) par4); @@ -182,8 +176,7 @@ public static void renderItemIn2D (Tessellator par0Tessellator, float par1, floa float f7; float f8; - for (k = 0; k < par5; ++k) - { + for (k = 0; k < par5; ++k) { f7 = (float) k / (float) par5; f8 = par1 + (par3 - par1) * f7 - f5; par0Tessellator.addVertexWithUV((double) f7, 0.0D, (double) (0.0F - par7), (double) f8, (double) par4); @@ -197,8 +190,7 @@ public static void renderItemIn2D (Tessellator par0Tessellator, float par1, floa par0Tessellator.setNormal(1.0F, 0.0F, 0.0F); float f9; - for (k = 0; k < par5; ++k) - { + for (k = 0; k < par5; ++k) { f7 = (float) k / (float) par5; f8 = par1 + (par3 - par1) * f7 - f5; f9 = f7 + 1.0F / (float) par5; @@ -212,8 +204,7 @@ public static void renderItemIn2D (Tessellator par0Tessellator, float par1, floa par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, 1.0F, 0.0F); - for (k = 0; k < par6; ++k) - { + for (k = 0; k < par6; ++k) { f7 = (float) k / (float) par6; f8 = par4 + (par2 - par4) * f7 - f6; f9 = f7 + 1.0F / (float) par6; @@ -227,8 +218,7 @@ public static void renderItemIn2D (Tessellator par0Tessellator, float par1, floa par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, -1.0F, 0.0F); - for (k = 0; k < par6; ++k) - { + for (k = 0; k < par6; ++k) { f7 = (float) k / (float) par6; f8 = par4 + (par2 - par4) * f7 - f6; par0Tessellator.addVertexWithUV(1.0D, (double) f7, 0.0D, (double) par3, (double) f8); @@ -239,5 +229,4 @@ public static void renderItemIn2D (Tessellator par0Tessellator, float par1, floa par0Tessellator.draw(); } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/armor/model/WingModel.java b/src/main/java/tconstruct/armor/model/WingModel.java index 7ebcf7a7e70..b6e2db4b851 100644 --- a/src/main/java/tconstruct/armor/model/WingModel.java +++ b/src/main/java/tconstruct/armor/model/WingModel.java @@ -4,8 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -public class WingModel extends ModelBiped -{ +public class WingModel extends ModelBiped { ModelRenderer WingBaseRight; ModelRenderer WingEdgeRight; ModelRenderer WingInsetRight; @@ -19,22 +18,21 @@ public class WingModel extends ModelBiped ModelRenderer WingFlangeLeft; ModelRenderer WingAuxLeft; - public WingModel() - { + public WingModel() { super(0.25f, 0, 64, 64); textureWidth = 64; textureHeight = 32; - //Right Wing + // Right Wing WingBaseRight = new ModelRenderer(this, 0, 9); WingBaseRight.addBox(-0.5F, -1F, 0F, 1, 2, 10); WingBaseRight.setRotationPoint(-1F, 1F, 0F); setRotation(WingBaseRight, 0.5235988F, -0.5235988F, 0F); - WingEdgeRight = new ModelRenderer(this, 0, 21); //Texture position - WingEdgeRight.addBox(0F, 0F, -2F, 1, 9, 2); //Offset, Size - WingEdgeRight.setRotationPoint(-0.502F, -1F, 10F); //Negative x, y - 1, Position - setRotation(WingEdgeRight, 0.5235988F, 0F, 0F); //Angle in radians + WingEdgeRight = new ModelRenderer(this, 0, 21); // Texture position + WingEdgeRight.addBox(0F, 0F, -2F, 1, 9, 2); // Offset, Size + WingEdgeRight.setRotationPoint(-0.502F, -1F, 10F); // Negative x, y - 1, Position + setRotation(WingEdgeRight, 0.5235988F, 0F, 0F); // Angle in radians WingInsetRight = new ModelRenderer(this, 6, 21); WingInsetRight.addBox(0F, 0F, -1F, 1, 9, 2); @@ -62,7 +60,7 @@ public WingModel() WingBaseRight.addChild(WingFlangeRight); WingBaseRight.addChild(WingAuxRight); - //Left Wing + // Left Wing WingBaseLeft = new ModelRenderer(this, 42, 9); WingBaseLeft.addBox(-0.5F, -1F, 0F, 1, 2, 10); WingBaseLeft.setRotationPoint(1F, 1F, 0F); @@ -109,26 +107,22 @@ public WingModel() this.bipedLeftLeg.isHidden = true; } - public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); WingBaseRight.render(f5); WingBaseLeft.render(f5); } - private void setRotation (ModelRenderer model, float x, float y, float z) - { + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } - public void setRotationAngles (float f, float f1, float partialTick, float f3, float f4, float f5, Entity player) - { + public void setRotationAngles(float f, float f1, float partialTick, float f3, float f4, float f5, Entity player) { super.setRotationAngles(f, f1, partialTick, f3, f4, f5, player); - if (this.isRiding) - { + if (this.isRiding) { float slow = 17f; this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 10f + 0.9F; this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 5.0f - 0.7f; @@ -137,9 +131,7 @@ public void setRotationAngles (float f, float f1, float partialTick, float f3, f this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 10 + 0.9F; this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 5.0f + 0.7f; this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 2.5f + 0.3f; - } - else if (player.isInWater()) - { + } else if (player.isInWater()) { float slow = 17f; this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F; this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.8f; @@ -148,9 +140,7 @@ else if (player.isInWater()) this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F; this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.8f; this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.8f; - } - else if (player.posY - player.prevPosY < 0f && player.fallDistance > 2.3) - { + } else if (player.posY - player.prevPosY < 0f && player.fallDistance > 2.3) { float slow = 20f; this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.7F; this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.8f; @@ -159,9 +149,7 @@ else if (player.posY - player.prevPosY < 0f && player.fallDistance > 2.3) this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.7F; this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.8f; this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.3f; - } - else if (player.isSprinting() || this.onGround > 0) - { + } else if (player.isSprinting() || this.onGround > 0) { float slow = 1.73f; this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F; this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.6f; @@ -170,12 +158,9 @@ else if (player.isSprinting() || this.onGround > 0) this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F; this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.6f; this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.3f; - } - else - { + } else { float slow = 17f; - if (player.motionX != 0 || player.motionZ != 0) - slow = 6f; + if (player.motionX != 0 || player.motionZ != 0) slow = 6f; this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 5f + 0.5235988F; this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 3.0f - 0.6f; this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 1.5f - 0.3f; @@ -185,11 +170,9 @@ else if (player.isSprinting() || this.onGround > 0) this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 1.5f + 0.3f; } - if (this.isSneak) - { + if (this.isSneak) { this.WingBaseRight.rotateAngleX += 0.4f; this.WingBaseLeft.rotateAngleX += 0.4f; } } - } diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java index a58da13f140..6863db13dba 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java @@ -7,49 +7,39 @@ import org.lwjgl.opengl.GL11; import tconstruct.util.ItemHelper; -public class DryingRackRender implements ISimpleBlockRenderingHandler -{ +public class DryingRackRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 0) - { + if (metadata == 0) { renderer.setRenderBounds(0.0F, 0.0, 0.375F, 1.0F, 0.25F, 0.625F); } - if (metadata == 1) - { + if (metadata == 1) { renderer.setRenderBounds(0.375F, 0.0, 0.0f, 0.625F, 0.25F, 1F); } - if (metadata == 2) - { + if (metadata == 2) { renderer.setRenderBounds(0.0F, 0.75F, 0.75F, 1F, 1.0F, 1F); } - if (metadata == 3) - { + if (metadata == 3) { renderer.setRenderBounds(0.0F, 0.75F, 0F, 1F, 1.0F, 0.25F); } - if (metadata == 4) - { + if (metadata == 4) { renderer.setRenderBounds(0.75F, 0.75F, 0.0f, 1F, 1.0F, 1F); } - if (metadata == 5) - { + if (metadata == 5) { renderer.setRenderBounds(0F, 0.75F, 0.0f, 0.25F, 1.0F, 1F); } renderer.renderStandardBlock(block, x, y, z); @@ -59,19 +49,16 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } - public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta) - { + public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index ee94797ba9b..629f5f93f30 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -12,11 +12,9 @@ /* Special renderer, only used for drawing tools */ @SideOnly(Side.CLIENT) -public class DryingRackSpecialRender extends TileEntitySpecialRenderer -{ +public class DryingRackSpecialRender extends TileEntitySpecialRenderer { - public void render (DryingRackLogic logic, double posX, double posY, double posZ, float var8) - { + public void render(DryingRackLogic logic, double posX, double posY, double posZ, float var8) { GL11.glPushMatrix(); float var10 = (float) (posX - 0.5F); float var11 = (float) (posY - 0.5F); @@ -26,56 +24,45 @@ public void render (DryingRackLogic logic, double posX, double posY, double posZ GL11.glPopMatrix(); } - private void func_82402_b (DryingRackLogic logic) - { + private void func_82402_b(DryingRackLogic logic) { ItemStack stack = logic.getStackInSlot(0); - if (stack != null) - renderItem(logic, stack); + if (stack != null) renderItem(logic, stack); } - void renderItem (DryingRackLogic logic, ItemStack stack) - { + void renderItem(DryingRackLogic logic, ItemStack stack) { FancyEntityItem entityitem = new FancyEntityItem(logic.getWorldObj(), 0.0D, 0.0D, 0.0D, stack); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glPushMatrix(); int meta = logic.getWorldObj().getBlockMetadata(logic.xCoord, logic.yCoord, logic.zCoord); - if (meta <= 1) - GL11.glTranslatef(1F, -0.375F, 0.905F); - else - { + if (meta <= 1) GL11.glTranslatef(1F, -0.375F, 0.905F); + else { GL11.glTranslatef(1F, 0.375F, 0.905F); - if (meta / 2 == 2) - { + if (meta / 2 == 2) { GL11.glRotatef(90F, 0F, 1F, 0F); GL11.glTranslatef(-0.0625F, 0F, 0F); } - if (meta == 2) - GL11.glTranslatef(0F, 0F, 0.375F); - if (meta == 3) - { - // Rotate, Flip. - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(0F, 0F, 0.2F); - //GL11.glTranslatef(0F, 0F, -0.375F); + if (meta == 2) GL11.glTranslatef(0F, 0F, 0.375F); + if (meta == 3) { + // Rotate, Flip. + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glTranslatef(0F, 0F, 0.2F); + // GL11.glTranslatef(0F, 0F, -0.375F); } - if (meta == 4) - { + if (meta == 4) { GL11.glTranslatef(0F, 0F, 0.2875F); } - if (meta == 5) - { - //Rotate, Flip. - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(0F, 0F, 0.3F); - //GL11.glTranslatef(0F, 0F, -0.5F); + if (meta == 5) { + // Rotate, Flip. + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glTranslatef(0F, 0F, 0.3F); + // GL11.glTranslatef(0F, 0F, -0.5F); } } GL11.glScalef(2F, 2F, 2F); - if (stack.getItem() instanceof ItemBlock) - { + if (stack.getItem() instanceof ItemBlock) { // GL11.glRotatef(90F, -1, 0F, 0F); GL11.glTranslatef(0F, 0.2125F, 0.0375F); } @@ -88,8 +75,7 @@ void renderItem (DryingRackLogic logic, ItemStack stack) } @Override - public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) - { + public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) { this.render((DryingRackLogic) logic, var2, var4, var6, var8); } } diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index ac935dc80ac..33ba1f348e9 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -1,13 +1,12 @@ package tconstruct.armor.player; -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.util.UUID; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.util.UUID; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -19,76 +18,62 @@ import net.minecraft.nbt.NBTTagList; import tconstruct.library.accessory.IHealthAccessory; -public class ArmorExtended implements IInventory -{ +public class ArmorExtended implements IInventory { public ItemStack[] inventory = new ItemStack[7]; public WeakReference parent; public UUID globalID = UUID.fromString("B243BE32-DC1B-4C53-8D13-8752D5C69D5B"); - public void init (EntityPlayer player) - { + public void init(EntityPlayer player) { parent = new WeakReference(player); } @Override - public int getSizeInventory () - { + public int getSizeInventory() { return inventory.length; } - public boolean isStackInSlot (int slot) - { + public boolean isStackInSlot(int slot) { return inventory[slot] != null; } @Override - public ItemStack getStackInSlot (int slot) - { + public ItemStack getStackInSlot(int slot) { return inventory[slot]; } @Override - public ItemStack decrStackSize (int slot, int quantity) - { - if (inventory[slot] != null) - { + public ItemStack decrStackSize(int slot, int quantity) { + if (inventory[slot] != null) { // TConstruct.logger.info("Took something from slot " + slot); - if (inventory[slot].stackSize <= quantity) - { + if (inventory[slot].stackSize <= quantity) { ItemStack stack = inventory[slot]; inventory[slot] = null; return stack; } ItemStack split = inventory[slot].splitStack(quantity); - if (inventory[slot].stackSize == 0) - { + if (inventory[slot].stackSize == 0) { inventory[slot] = null; } EntityPlayer player = parent.get(); TPlayerStats stats = TPlayerStats.get(player); recalculateHealth(player, stats); return split; - } - else - { + } else { return null; } } @Override - public ItemStack getStackInSlotOnClosing (int slot) - { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } @Override - public void setInventorySlotContents (int slot, ItemStack itemstack) - { + public void setInventorySlotContents(int slot, ItemStack itemstack) { inventory[slot] = itemstack; // TConstruct.logger.info("Changed slot " + slot + " on side " + // FMLCommonHandler.instance().getEffectiveSide()); - if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) - { + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { itemstack.stackSize = getInventoryStackLimit(); } @@ -98,26 +83,22 @@ public void setInventorySlotContents (int slot, ItemStack itemstack) } @Override - public String getInventoryName () - { + public String getInventoryName() { return ""; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 64; } @Override - public void markDirty () - { + public void markDirty() { EntityPlayer player = parent.get(); TPlayerStats stats = TPlayerStats.get(player); // recalculateSkills(player, stats); @@ -129,18 +110,14 @@ public void markDirty () */ } - public void recalculateHealth (EntityPlayer player, TPlayerStats stats) - { + public void recalculateHealth(EntityPlayer player, TPlayerStats stats) { Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (inventory[4] != null || inventory[5] != null || inventory[6] != null) - { + if (inventory[4] != null || inventory[5] != null || inventory[6] != null) { int bonusHP = 0; - for (int i = 4; i < 7; i++) - { + for (int i = 4; i < 7; i++) { ItemStack stack = inventory[i]; - if (stack != null && stack.getItem() instanceof IHealthAccessory) - { + if (stack != null && stack.getItem() instanceof IHealthAccessory) { bonusHP += ((IHealthAccessory) stack.getItem()).getHealthBoost(stack); } } @@ -148,70 +125,53 @@ public void recalculateHealth (EntityPlayer player, TPlayerStats stats) stats.bonusHealth = bonusHP; int healthChange = bonusHP - prevHealth; - if (healthChange != 0) - { - IAttributeInstance attributeinstance = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); - try - { + if (healthChange != 0) { + IAttributeInstance attributeinstance = + player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); + try { attributeinstance.removeModifier(attributeinstance.getModifier(globalID)); + } catch (Exception e) { } - catch (Exception e) - { - } - attributeinstance.applyModifier(new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0)); - + attributeinstance.applyModifier( + new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0)); } - } - else if (parent != null && parent.get() != null) - { + } else if (parent != null && parent.get() != null) { int prevHealth = stats.bonusHealth; int bonusHP = 0; stats.bonusHealth = bonusHP; int healthChange = bonusHP - prevHealth; - if (healthChange != 0) - { - IAttributeInstance attributeinstance = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); - try - { + if (healthChange != 0) { + IAttributeInstance attributeinstance = + player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth); + try { attributeinstance.removeModifier(attributeinstance.getModifier(globalID)); - } - catch (Exception e) - { + } catch (Exception e) { } } } } @Override - public boolean isUseableByPlayer (EntityPlayer entityplayer) - { + public boolean isUseableByPlayer(EntityPlayer entityplayer) { return true; } - public void openChest () - { - } + public void openChest() {} - public void closeChest () - { - } + public void closeChest() {} @Override - public boolean isItemValidForSlot (int slot, ItemStack itemstack) - { + public boolean isItemValidForSlot(int slot, ItemStack itemstack) { return false; } /* Save/Load */ - public void saveToNBT (NBTTagCompound tagCompound) - { + public void saveToNBT(NBTTagCompound tagCompound) { NBTTagList tagList = new NBTTagList(); NBTTagCompound invSlot; - for (int i = 0; i < this.inventory.length; ++i) - { - if (this.inventory[i] != null) - { + for (int i = 0; i < this.inventory.length; ++i) { + if (this.inventory[i] != null) { invSlot = new NBTTagCompound(); invSlot.setByte("Slot", (byte) i); this.inventory[i].writeToNBT(invSlot); @@ -222,27 +182,22 @@ public void saveToNBT (NBTTagCompound tagCompound) tagCompound.setTag("Inventory", tagList); } - public void readFromNBT (NBTTagCompound tagCompound) - { - if (tagCompound != null) - { + public void readFromNBT(NBTTagCompound tagCompound) { + if (tagCompound != null) { NBTTagList tagList = tagCompound.getTagList("Inventory", 10); - for (int i = 0; i < tagList.tagCount(); ++i) - { + for (int i = 0; i < tagList.tagCount(); ++i) { NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); - if (itemstack != null) - { + if (itemstack != null) { this.inventory[j] = itemstack; } } } } - -// --- EnderIO SoulBound enchant support + // --- EnderIO SoulBound enchant support private static int soulBoundID = -6; @@ -273,18 +228,13 @@ public static boolean isSoulBounded(ItemStack stack) { return false; } -// --- + // --- - - public void dropItems () - { + public void dropItems() { EntityPlayer player = parent.get(); - if (player != null) - { - for (int i = 0; i < 4; ++i) - { - if (this.inventory[i] != null && !isSoulBounded(this.inventory[i])) - { + if (player != null) { + for (int i = 0; i < 4; ++i) { + if (this.inventory[i] != null && !isSoulBounded(this.inventory[i])) { player.func_146097_a(this.inventory[i], true, false); this.inventory[i] = null; } @@ -293,24 +243,16 @@ public void dropItems () } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} - public void writeInventoryToStream (ByteBuf os) throws IOException - { - for (int i = 0; i < inventory.length; i++) - ByteBufUtils.writeItemStack(os, inventory[i]); + public void writeInventoryToStream(ByteBuf os) throws IOException { + for (int i = 0; i < inventory.length; i++) ByteBufUtils.writeItemStack(os, inventory[i]); } - public void readInventoryFromStream (ByteBuf is) throws IOException - { - for (int i = 0; i < inventory.length; i++) - inventory[i] = ByteBufUtils.readItemStack(is); + public void readInventoryFromStream(ByteBuf is) throws IOException { + for (int i = 0; i < inventory.length; i++) inventory[i] = ByteBufUtils.readItemStack(is); } } diff --git a/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java b/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java index 01cb9046133..38f343b75ac 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtendedClient.java @@ -1,7 +1,6 @@ package tconstruct.armor.player; -public class ArmorExtendedClient extends ArmorExtended -{ +public class ArmorExtendedClient extends ArmorExtended { /* * public void recalculateSkills(EntityPlayer player, TPlayerStats stats) { * TConstruct.logger.info("Client skills"); if (inventory[1] != null && diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java index a2bf5d62bfe..b929ad321e9 100644 --- a/src/main/java/tconstruct/armor/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/armor/player/KnapsackInventory.java @@ -1,10 +1,9 @@ package tconstruct.armor.player; -import java.io.IOException; -import java.lang.ref.WeakReference; - import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.lang.ref.WeakReference; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -13,126 +12,99 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class KnapsackInventory implements IInventory -{ +public class KnapsackInventory implements IInventory { public ItemStack[] inventory = new ItemStack[27]; public WeakReference parent; - public void init (EntityPlayer player) - { + public void init(EntityPlayer player) { parent = new WeakReference(player); } @Override - public ItemStack getStackInSlot (int slot) - { + public ItemStack getStackInSlot(int slot) { return inventory[slot]; } - public boolean isStackInSlot (int slot) - { + public boolean isStackInSlot(int slot) { return inventory[slot] != null; } @Override - public int getSizeInventory () - { + public int getSizeInventory() { return inventory.length; } @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 64; } - public boolean canDropInventorySlot (int slot) - { + public boolean canDropInventorySlot(int slot) { return true; } @Override - public void setInventorySlotContents (int slot, ItemStack itemstack) - { + public void setInventorySlotContents(int slot, ItemStack itemstack) { inventory[slot] = itemstack; - if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) - { + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { itemstack.stackSize = getInventoryStackLimit(); } } @Override - public ItemStack decrStackSize (int slot, int quantity) - { - if (inventory[slot] != null) - { - if (inventory[slot].stackSize <= quantity) - { + public ItemStack decrStackSize(int slot, int quantity) { + if (inventory[slot] != null) { + if (inventory[slot].stackSize <= quantity) { ItemStack stack = inventory[slot]; inventory[slot] = null; return stack; } ItemStack split = inventory[slot].splitStack(quantity); - if (inventory[slot].stackSize == 0) - { + if (inventory[slot].stackSize == 0) { inventory[slot] = null; } return split; - } - else - { + } else { return null; } } @Override - public String getInventoryName () - { + public String getInventoryName() { return "tconstruct.knapsack"; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public ItemStack getStackInSlotOnClosing (int slot) - { + public ItemStack getStackInSlotOnClosing(int slot) { return null; } - public void openChest () - { - } + public void openChest() {} - public void closeChest () - { - } + public void closeChest() {} @Override - public boolean isItemValidForSlot (int i, ItemStack itemstack) - { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return true; } @Override - public boolean isUseableByPlayer (EntityPlayer entityplayer) - { + public boolean isUseableByPlayer(EntityPlayer entityplayer) { return true; } /* Save/Load */ - public void saveToNBT (NBTTagCompound tagCompound) - { + public void saveToNBT(NBTTagCompound tagCompound) { NBTTagList tagList = new NBTTagList(); NBTTagCompound invSlot; - for (int i = 0; i < this.inventory.length; ++i) - { - if (this.inventory[i] != null) - { + for (int i = 0; i < this.inventory.length; ++i) { + if (this.inventory[i] != null) { invSlot = new NBTTagCompound(); invSlot.setByte("Slot", (byte) i); this.inventory[i].writeToNBT(invSlot); @@ -143,36 +115,28 @@ public void saveToNBT (NBTTagCompound tagCompound) tagCompound.setTag("Knapsack", tagList); } - public void readFromNBT (NBTTagCompound tagCompound) - { + public void readFromNBT(NBTTagCompound tagCompound) { // player doesn't have a knapsack saved, tcon probably wasn't present before. don't error out. - if(tagCompound == null || !tagCompound.hasKey("Knapsack")) - return; + if (tagCompound == null || !tagCompound.hasKey("Knapsack")) return; NBTTagList tagList = tagCompound.getTagList("Knapsack", 10); - for (int i = 0; i < tagList.tagCount(); ++i) - { + for (int i = 0; i < tagList.tagCount(); ++i) { NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); - if (itemstack != null) - { + if (itemstack != null) { this.inventory[j] = itemstack; } } } - public void dropItems () - { + public void dropItems() { EntityPlayer player = parent.get(); - if (player != null) - { - for (int i = 0; i < inventory.length; ++i) - { - if (this.inventory[i] != null) - { + if (player != null) { + for (int i = 0; i < inventory.length; ++i) { + if (this.inventory[i] != null) { player.func_146097_a(this.inventory[i], true, false); this.inventory[i] = null; } @@ -180,16 +144,12 @@ public void dropItems () } } - public void unequipItems () - { + public void unequipItems() { EntityPlayer player = parent.get(); - if (player != null) - { - for (int i = 0; i < inventory.length; ++i) - { - if (this.inventory[i] != null) - { + if (player != null) { + for (int i = 0; i < inventory.length; ++i) { + if (this.inventory[i] != null) { dropItemEntity(player, inventory[i]); this.inventory[i] = null; } @@ -197,37 +157,25 @@ public void unequipItems () } } - void dropItemEntity (Entity dropper, ItemStack dropStack) - { + void dropItemEntity(Entity dropper, ItemStack dropStack) { EntityItem entityitem = new EntityItem(dropper.worldObj, dropper.posX, dropper.posY, dropper.posZ, dropStack); dropper.worldObj.spawnEntityInWorld(entityitem); } @Override - public void markDirty () - { - } + public void markDirty() {} @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} - public void writeInventoryToStream (ByteBuf os) throws IOException - { - for (int i = 0; i < 27; i++) - ByteBufUtils.writeItemStack(os, inventory[i]); + public void writeInventoryToStream(ByteBuf os) throws IOException { + for (int i = 0; i < 27; i++) ByteBufUtils.writeItemStack(os, inventory[i]); } - public void readInventoryFromStream (ByteBuf is) throws IOException - { - for (int i = 0; i < 27; i++) - inventory[i] = ByteBufUtils.readItemStack(is); + public void readInventoryFromStream(ByteBuf is) throws IOException { + for (int i = 0; i < 27; i++) inventory[i] = ByteBufUtils.readItemStack(is); } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index 78122c8f207..207ec95a1eb 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -10,7 +10,6 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; import mantle.player.PlayerUtils; -import net.minecraft.client.Minecraft; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.*; import net.minecraft.entity.Entity.EnumEntitySize; @@ -21,69 +20,58 @@ import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.PlayerDropsEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -//TODO: Redesign this class -public class TPlayerHandler -{ +// TODO: Redesign this class +public class TPlayerHandler { /* Player */ // public int hunger; private ConcurrentHashMap playerStats = new ConcurrentHashMap(); @SubscribeEvent - public void PlayerLoggedInEvent (PlayerLoggedInEvent event) - { + public void PlayerLoggedInEvent(PlayerLoggedInEvent event) { onPlayerLogin(event.player); } @SubscribeEvent - public void onPlayerRespawn (PlayerRespawnEvent event) - { + public void onPlayerRespawn(PlayerRespawnEvent event) { onPlayerRespawn(event.player); } @SubscribeEvent - public void onEntityConstructing (EntityEvent.EntityConstructing event) - { - if (event.entity instanceof EntityPlayer && TPlayerStats.get((EntityPlayer) event.entity) == null) - { + public void onEntityConstructing(EntityEvent.EntityConstructing event) { + if (event.entity instanceof EntityPlayer && TPlayerStats.get((EntityPlayer) event.entity) == null) { TPlayerStats.register((EntityPlayer) event.entity); } } - public void onPlayerLogin (EntityPlayer player) - { + public void onPlayerLogin(EntityPlayer player) { // Lookup player TPlayerStats stats = TPlayerStats.get(player); stats.level = player.experienceLevel; stats.hunger = player.getFoodStats().getFoodLevel(); - //stats.battlesignBonus = tags.getCompoundTag("TConstruct").getBoolean("battlesignBonus"); + // stats.battlesignBonus = tags.getCompoundTag("TConstruct").getBoolean("battlesignBonus"); // gamerule naturalRegeneration false if (!PHConstruct.enableHealthRegen) player.worldObj.getGameRules().setOrCreateGameRule("naturalRegeneration", "false"); - if (!stats.beginnerManual) - { + if (!stats.beginnerManual) { stats.beginnerManual = true; stats.battlesignBonus = true; - if (PHConstruct.beginnerBook) - { + if (PHConstruct.beginnerBook) { ItemStack diary = new ItemStack(TinkerTools.manualBook); - if (!player.inventory.addItemStackToInventory(diary)) - { + if (!player.inventory.addItemStackToInventory(diary)) { AbilityHelper.spawnItemAtPlayer(player, diary); } } - if (player.getDisplayName().toLowerCase().equals("fractuality")) - { + if (player.getDisplayName().toLowerCase().equals("fractuality")) { ItemStack pattern = new ItemStack(TinkerTools.woodPattern, 1, 22); NBTTagCompound compound = new NBTTagCompound(); @@ -98,8 +86,7 @@ public void onPlayerLogin (EntityPlayer player) AbilityHelper.spawnItemAtPlayer(player, pattern); } - if (player.getDisplayName().toLowerCase().equals("zerokyuuni")) - { + if (player.getDisplayName().toLowerCase().equals("zerokyuuni")) { ItemStack pattern = new ItemStack(Items.stick); NBTTagCompound compound = new NBTTagCompound(); @@ -112,15 +99,13 @@ public void onPlayerLogin (EntityPlayer player) AbilityHelper.spawnItemAtPlayer(player, pattern); } - if (player.getDisplayName().toLowerCase().equals("zisteau")) - { + if (player.getDisplayName().toLowerCase().equals("zisteau")) { spawnPigmanModifier(player); } NBTTagCompound tags = player.getEntityData(); NBTTagCompound persistTag = tags.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); - if (stickUsers.contains(player.getDisplayName()) && !persistTag.hasKey("TCon-Stick")) - { + if (stickUsers.contains(player.getDisplayName()) && !persistTag.hasKey("TCon-Stick")) { ItemStack stick = new ItemStack(Items.stick); persistTag.setBoolean("TCon-Stick", true); @@ -139,11 +124,8 @@ public void onPlayerLogin (EntityPlayer player) AbilityHelper.spawnItemAtPlayer(player, stick); tags.setTag(EntityPlayer.PERSISTED_NBT_TAG, persistTag); } - } - else - { - if (!stats.battlesignBonus) - { + } else { + if (!stats.battlesignBonus) { stats.battlesignBonus = true; ItemStack modifier = new ItemStack(TinkerTools.creativeModifier); @@ -158,27 +140,24 @@ public void onPlayerLogin (EntityPlayer player) AbilityHelper.spawnItemAtPlayer(player, modifier); - if (player.getDisplayName().toLowerCase().equals("zisteau")) - { + if (player.getDisplayName().toLowerCase().equals("zisteau")) { spawnPigmanModifier(player); } } } - if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon")) - { + if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon")) { PHConstruct.gregtech = false; - if (PHConstruct.lavaFortuneInteraction) - { + if (PHConstruct.lavaFortuneInteraction) { PlayerUtils.sendChatMessage(player, "Warning: Cross-mod Exploit Present!"); PlayerUtils.sendChatMessage(player, "Solution 1: Disable Reverse Smelting recipes from GregTech."); - PlayerUtils.sendChatMessage(player, "Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); + PlayerUtils.sendChatMessage( + player, "Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); } } } - void spawnPigmanModifier (EntityPlayer entityplayer) - { + void spawnPigmanModifier(EntityPlayer entityplayer) { ItemStack modifier = new ItemStack(TinkerTools.creativeModifier); NBTTagCompound compound = new NBTTagCompound(); @@ -194,13 +173,11 @@ void spawnPigmanModifier (EntityPlayer entityplayer) AbilityHelper.spawnItemAtPlayer(entityplayer, modifier); } - public void onPlayerRespawn (EntityPlayer entityplayer) - { + public void onPlayerRespawn(EntityPlayer entityplayer) { // Boom! TPlayerStats playerData = playerStats.remove(entityplayer.getPersistentID()); TPlayerStats stats = TPlayerStats.get(entityplayer); - if (playerData != null) - { + if (playerData != null) { stats.copyFrom(playerData, false); stats.level = playerData.level; stats.hunger = playerData.hunger; @@ -213,37 +190,29 @@ public void onPlayerRespawn (EntityPlayer entityplayer) * TFoodStats food = new TFoodStats(); entityplayer.foodStats = food; */ - if (PHConstruct.keepLevels) - entityplayer.experienceLevel = stats.level; - if (PHConstruct.keepHunger) - entityplayer.getFoodStats().addStats(-1 * (20 - stats.hunger), 0); + if (PHConstruct.keepLevels) entityplayer.experienceLevel = stats.level; + if (PHConstruct.keepHunger) entityplayer.getFoodStats().addStats(-1 * (20 - stats.hunger), 0); Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (side == Side.CLIENT) - { + if (side == Side.CLIENT) { // TProxyClient.controlInstance.resetControls(); - if (PHConstruct.keepHunger) - entityplayer.getFoodStats().setFoodLevel(stats.hunger); + if (PHConstruct.keepHunger) entityplayer.getFoodStats().setFoodLevel(stats.hunger); } } @SubscribeEvent - public void livingFall (LivingFallEvent evt) // Only for negating fall damage - { - if (evt.entityLiving instanceof EntityPlayer) - { + public void livingFall(LivingFallEvent evt) // Only for negating fall damage + { + if (evt.entityLiving instanceof EntityPlayer) { evt.distance -= 1; } } @SubscribeEvent - public void playerDeath (LivingDeathEvent event) - { - if(!(event.entity instanceof EntityPlayer)) - return; + public void playerDeath(LivingDeathEvent event) { + if (!(event.entity instanceof EntityPlayer)) return; - if (!event.entity.worldObj.isRemote) - { + if (!event.entity.worldObj.isRemote) { TPlayerStats properties = (TPlayerStats) event.entity.getExtendedProperties(TPlayerStats.PROP_NAME); properties.hunger = ((EntityPlayer) event.entity).getFoodStats().getFoodLevel(); playerStats.put(((EntityPlayer) event.entity).getPersistentID(), properties); @@ -251,21 +220,17 @@ public void playerDeath (LivingDeathEvent event) } @SubscribeEvent - public void playerDrops (PlayerDropsEvent evt) - { + public void playerDrops(PlayerDropsEvent evt) { // After playerDeath event. Modifying saved data. TPlayerStats stats = playerStats.get(evt.entityPlayer.getPersistentID()); stats.level = evt.entityPlayer.experienceLevel / 2; // stats.health = 20; int hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); - if (hunger < 6) - stats.hunger = 6; - else - stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + if (hunger < 6) stats.hunger = 6; + else stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); - if (evt.entityPlayer.capturedDrops != evt.drops) - { + if (evt.entityPlayer.capturedDrops != evt.drops) { evt.entityPlayer.capturedDrops.clear(); } @@ -274,8 +239,7 @@ public void playerDrops (PlayerDropsEvent evt) stats.knapsack.dropItems(); evt.entityPlayer.captureDrops = false; - if (evt.entityPlayer.capturedDrops != evt.drops) - { + if (evt.entityPlayer.capturedDrops != evt.drops) { evt.drops.addAll(evt.entityPlayer.capturedDrops); } @@ -283,19 +247,16 @@ public void playerDrops (PlayerDropsEvent evt) } /* Modify Player */ - public void updateSize (String user, float offset) - { + public void updateSize(String user, float offset) { /* * EntityPlayer player = getEntityPlayer(user); setEntitySize(0.6F, * offset, player); player.yOffset = offset - 0.18f; */ } - public static void setEntitySize (float width, float height, Entity entity) - { + public static void setEntitySize(float width, float height, Entity entity) { // TConstruct.logger.info("Size: " + height); - if (width != entity.width || height != entity.height) - { + if (width != entity.width || height != entity.height) { entity.width = width; entity.height = height; entity.boundingBox.maxX = entity.boundingBox.minX + (double) entity.width; @@ -305,28 +266,17 @@ public static void setEntitySize (float width, float height, Entity entity) float que = width % 2.0F; - if ((double) que < 0.375D) - { + if ((double) que < 0.375D) { entity.myEntitySize = EnumEntitySize.SIZE_1; - } - else if ((double) que < 0.75D) - { + } else if ((double) que < 0.75D) { entity.myEntitySize = EnumEntitySize.SIZE_2; - } - else if ((double) que < 1.0D) - { + } else if ((double) que < 1.0D) { entity.myEntitySize = EnumEntitySize.SIZE_3; - } - else if ((double) que < 1.375D) - { + } else if ((double) que < 1.375D) { entity.myEntitySize = EnumEntitySize.SIZE_4; - } - else if ((double) que < 1.75D) - { + } else if ((double) que < 1.75D) { entity.myEntitySize = EnumEntitySize.SIZE_5; - } - else - { + } else { entity.myEntitySize = EnumEntitySize.SIZE_6; } // entity.yOffset = height; @@ -336,11 +286,9 @@ else if ((double) que < 1.75D) private final int timeout = 1000; private HashSet stickUsers = new HashSet(); - public void buildStickURLDatabase (String location) - { + public void buildStickURLDatabase(String location) { URL url; - try - { + try { url = new URL(location); URLConnection con = url.openConnection(); con.setConnectTimeout(timeout); @@ -350,19 +298,15 @@ public void buildStickURLDatabase (String location) String nick; int linetracker = 1; - while ((nick = br.readLine()) != null) - { - if (!nick.startsWith("--")) - { + while ((nick = br.readLine()) != null) { + if (!nick.startsWith("--")) { stickUsers.add(nick); } linetracker++; } br.close(); - } - catch (Exception e) - { + } catch (Exception e) { TConstruct.logger.error(e.getMessage() != null ? e.getMessage() : "UNKOWN DL ERROR", e); } } diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java index c24d64332aa..c4db35d591b 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerStats.java +++ b/src/main/java/tconstruct/armor/player/TPlayerStats.java @@ -1,7 +1,6 @@ package tconstruct.armor.player; import java.lang.ref.WeakReference; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,7 +9,9 @@ import net.minecraftforge.common.IExtendedEntityProperties; import tconstruct.api.IPlayerExtendedInventoryWrapper; -public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedInventoryWrapper //TODO: IExtendedEntityProperties is not appropriate! +public class TPlayerStats + implements IExtendedEntityProperties, + IPlayerExtendedInventoryWrapper // TODO: IExtendedEntityProperties is not appropriate! { public static final String PROP_NAME = "TConstruct"; @@ -37,14 +38,12 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI public ArmorExtended armor; public KnapsackInventory knapsack; - public TPlayerStats() - { + public TPlayerStats() { this.armor = new ArmorExtended(); this.knapsack = new KnapsackInventory(); } - public TPlayerStats(EntityPlayer entityplayer) - { + public TPlayerStats(EntityPlayer entityplayer) { this.player = new WeakReference(entityplayer); this.armor = new ArmorExtended(); this.armor.init(entityplayer); @@ -56,8 +55,7 @@ public TPlayerStats(EntityPlayer entityplayer) } @Override - public void saveNBTData (NBTTagCompound compound) - { + public void saveNBTData(NBTTagCompound compound) { NBTTagCompound tTag = new NBTTagCompound(); armor.saveToNBT(tTag); knapsack.saveToNBT(tTag); @@ -71,11 +69,9 @@ public void saveNBTData (NBTTagCompound compound) } @Override - public void loadNBTData (NBTTagCompound compound) - { + public void loadNBTData(NBTTagCompound compound) { NBTTagCompound properties = (NBTTagCompound) compound.getTag(PROP_NAME); - if (properties != null) - { + if (properties != null) { this.armor.readFromNBT(properties); this.knapsack.readFromNBT(properties); this.beginnerManual = properties.getBoolean("beginnerManual"); @@ -88,15 +84,13 @@ public void loadNBTData (NBTTagCompound compound) } @Override - public void init (Entity entity, World world) - { + public void init(Entity entity, World world) { this.player = new WeakReference((EntityPlayer) entity); this.armor.init((EntityPlayer) entity); this.knapsack.init((EntityPlayer) entity); } - public void copyFrom (TPlayerStats stats, boolean copyCalc) - { + public void copyFrom(TPlayerStats stats, boolean copyCalc) { this.armor = stats.armor; this.knapsack = stats.knapsack; this.beginnerManual = stats.beginnerManual; @@ -107,34 +101,28 @@ public void copyFrom (TPlayerStats stats, boolean copyCalc) this.derpLevel = stats.derpLevel; - if (copyCalc) - { + if (copyCalc) { this.bonusHealth = stats.bonusHealth; this.hunger = stats.hunger; this.level = stats.level; } } - public static final void register (EntityPlayer player) - { + public static final void register(EntityPlayer player) { player.registerExtendedProperties(TPlayerStats.PROP_NAME, new TPlayerStats(player)); } - public static final TPlayerStats get (EntityPlayer player) - { + public static final TPlayerStats get(EntityPlayer player) { return (TPlayerStats) player.getExtendedProperties(PROP_NAME); } @Override - public IInventory getKnapsackInventory (EntityPlayer player) - { + public IInventory getKnapsackInventory(EntityPlayer player) { return this.knapsack; } @Override - public IInventory getAccessoryInventory (EntityPlayer player) - { + public IInventory getAccessoryInventory(EntityPlayer player) { return this.armor; } - } diff --git a/src/main/java/tconstruct/blocks/BlockFalling.java b/src/main/java/tconstruct/blocks/BlockFalling.java index 7ef5c2d857c..f8553885882 100644 --- a/src/main/java/tconstruct/blocks/BlockFalling.java +++ b/src/main/java/tconstruct/blocks/BlockFalling.java @@ -8,52 +8,49 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; -public class BlockFalling extends Block -{ +public class BlockFalling extends Block { public static boolean fallInstantly; - public BlockFalling() - { + public BlockFalling() { super(Material.craftedSnow); this.setCreativeTab(CreativeTabs.tabBlock); } - public BlockFalling(Material p_i45405_1_) - { + public BlockFalling(Material p_i45405_1_) { super(p_i45405_1_); } @Override - public void onBlockAdded (World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) - { + public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) { p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_)); } @Override - public void onNeighborBlockChange (World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) - { + public void onNeighborBlockChange( + World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) { p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_)); } @Override - public void updateTick (World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) - { - if (!p_149674_1_.isRemote) - { + public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + if (!p_149674_1_.isRemote) { this.func_149830_m(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_); } } - private void func_149830_m (World p_149830_1_, int p_149830_2_, int p_149830_3_, int p_149830_4_) - { - if (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ >= 0) - { + private void func_149830_m(World p_149830_1_, int p_149830_2_, int p_149830_3_, int p_149830_4_) { + if (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ >= 0) { byte b0 = 32; - if (!fallInstantly && p_149830_1_.checkChunksExist(p_149830_2_ - b0, p_149830_3_ - b0, p_149830_4_ - b0, p_149830_2_ + b0, p_149830_3_ + b0, p_149830_4_ + b0)) - { - if (!p_149830_1_.isRemote) - { + if (!fallInstantly + && p_149830_1_.checkChunksExist( + p_149830_2_ - b0, + p_149830_3_ - b0, + p_149830_4_ - b0, + p_149830_2_ + b0, + p_149830_3_ + b0, + p_149830_4_ + b0)) { + if (!p_149830_1_.isRemote) { // EntityFallingBlock entityfallingblock = new // EntityFallingBlock(p_149830_1_, // (double)((float)p_149830_2_ + 0.5F), @@ -64,48 +61,35 @@ private void func_149830_m (World p_149830_1_, int p_149830_2_, int p_149830_3_, // this.func_149829_a(entityfallingblock); // p_149830_1_.spawnEntityInWorld(entityfallingblock); } - } - else - { + } else { p_149830_1_.setBlockToAir(p_149830_2_, p_149830_3_, p_149830_4_); - while (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ > 0) - { + while (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ > 0) { --p_149830_3_; } - if (p_149830_3_ > 0) - { + if (p_149830_3_ > 0) { p_149830_1_.setBlock(p_149830_2_, p_149830_3_, p_149830_4_, this); } } } } - protected void func_149829_a (EntityFallingBlock p_149829_1_) - { - } + protected void func_149829_a(EntityFallingBlock p_149829_1_) {} @Override - public int tickRate (World p_149738_1_) - { + public int tickRate(World p_149738_1_) { return 2; } - public static boolean func_149831_e (World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_) - { + public static boolean func_149831_e(World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_) { Block block = p_149831_0_.getBlock(p_149831_1_, p_149831_2_, p_149831_3_); - if (block.isAir(p_149831_0_, p_149831_1_, p_149831_2_, p_149831_3_)) - { + if (block.isAir(p_149831_0_, p_149831_1_, p_149831_2_, p_149831_3_)) { return true; - } - else if (block == Blocks.fire) - { + } else if (block == Blocks.fire) { return true; - } - else - { + } else { // TODO: King, take a look here when doing liquids! // Material material = block.blockMaterial; // return material == Material.water ? true : material == @@ -114,7 +98,5 @@ else if (block == Blocks.fire) } } - public void func_149828_a (World p_149828_1_, int p_149828_2_, int p_149828_3_, int p_149828_4_, int p_149828_5_) - { - } -} \ No newline at end of file + public void func_149828_a(World p_149828_1_, int p_149828_2_, int p_149828_3_, int p_149828_4_, int p_149828_5_) {} +} diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index f366a8290cd..b0b739cd2b8 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -13,20 +13,17 @@ import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; -public class SlabBase extends MantleBlock -{ +public class SlabBase extends MantleBlock { Block modelBlock; int startingMeta; int totalSize; - public SlabBase(Material material) - { + public SlabBase(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); } - public SlabBase(Material material, Block model, int meta, int totalSize) - { + public SlabBase(Material material, Block model, int meta, int totalSize) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.modelBlock = model; @@ -35,70 +32,66 @@ public SlabBase(Material material, Block model, int meta, int totalSize) } @Override - public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) - { + public void addCollisionBoxesToList( + World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } - public void setBlockBoundsForItemRender () - { + public void setBlockBoundsForItemRender() { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } - public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) - { + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z) / 8; float minY = meta == 1 ? 0.5F : 0.0F; float maxY = meta == 1 ? 1.0F : 0.5F; setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } - public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata) - { - if (side == 1) - return metadata; - if (side == 0 || clickY >= 0.5F) - return metadata | 8; + public int onBlockPlaced( + World par1World, + int blockX, + int blockY, + int blockZ, + int side, + float clickX, + float clickY, + float clickZ, + int metadata) { + if (side == 1) return metadata; + if (side == 0 || clickY >= 0.5F) return metadata | 8; return metadata; } - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { - } + public void registerBlockIcons(IIconRegister iconRegister) {} @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { meta = meta % 8 + startingMeta; return modelBlock.getIcon(side, meta); } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < totalSize; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < totalSize; iter++) { list.add(new ItemStack(id, 1, iter)); } } - public int damageDropped (int meta) - { + public int damageDropped(int meta) { return meta % 8; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index 392806b421d..7b5c021c9cb 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -10,13 +10,11 @@ import net.minecraft.util.IIcon; import tconstruct.library.TConstructRegistry; -public class TConstructBlock extends MantleBlock -{ +public class TConstructBlock extends MantleBlock { public String[] textureNames; public IIcon[] icons; - public TConstructBlock(Material material, float hardness, String[] tex) - { + public TConstructBlock(Material material, float hardness, String[] tex) { super(material); setHardness(hardness); this.setCreativeTab(TConstructRegistry.blockTab); @@ -24,47 +22,38 @@ public TConstructBlock(Material material, float hardness, String[] tex) } @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { return meta; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return meta < icons.length ? icons[meta] : icons[0]; } @SideOnly(Side.CLIENT) - public int getSideTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getSideTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } // TODO getSubBlocks @Override - public void getSubBlocks (Item block, CreativeTabs tab, List list) - { - for (int iter = 0; iter < icons.length; iter++) - { + public void getSubBlocks(Item block, CreativeTabs tab, List list) { + for (int iter = 0; iter < icons.length; iter++) { list.add(new ItemStack(block, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 9e6ccb72620..5bcd771c4a6 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -12,36 +12,29 @@ import net.minecraft.world.World; import tconstruct.library.crafting.DryingRackRecipes; -public class DryingRackLogic extends InventoryLogic -{ +public class DryingRackLogic extends InventoryLogic { int currentTime; int maxTime; - public DryingRackLogic() - { + public DryingRackLogic() { super(1, 1); } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return null; } @Override - public String getDefaultName () - { + public String getDefaultName() { return ""; } @Override - public void updateEntity () - { - if (!worldObj.isRemote && maxTime > 0 && currentTime < maxTime) - { + public void updateEntity() { + if (!worldObj.isRemote && maxTime > 0 && currentTime < maxTime) { currentTime++; - if (currentTime >= maxTime) - { + if (currentTime >= maxTime) { inventory[0] = DryingRackRecipes.getDryingResult(inventory[0]); updateDryingTime(); } @@ -49,103 +42,88 @@ public void updateEntity () } @Override - public void setInventorySlotContents (int slot, ItemStack itemstack) - { + public void setInventorySlotContents(int slot, ItemStack itemstack) { super.setInventorySlotContents(slot, itemstack); updateDryingTime(); } @Override - public ItemStack decrStackSize (int slot, int quantity) - { + public ItemStack decrStackSize(int slot, int quantity) { ItemStack stack = super.decrStackSize(slot, quantity); maxTime = 0; currentTime = 0; return stack; } - public void updateDryingTime () - { + public void updateDryingTime() { currentTime = 0; - if (inventory[0] != null) - maxTime = DryingRackRecipes.getDryingTime(inventory[0]); - else - maxTime = 0; + if (inventory[0] != null) maxTime = DryingRackRecipes.getDryingTime(inventory[0]); + else maxTime = 0; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { currentTime = tags.getInteger("Time"); maxTime = tags.getInteger("MaxTime"); readCustomNBT(tags); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { tags.setInteger("Time", currentTime); tags.setInteger("MaxTime", maxTime); writeCustomNBT(tags); } - public void readCustomNBT (NBTTagCompound tags) - { + public void readCustomNBT(NBTTagCompound tags) { super.readFromNBT(tags); } - public void writeCustomNBT (NBTTagCompound tags) - { + public void writeCustomNBT(NBTTagCompound tags) { super.writeToNBT(tags); } /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox () - { - AxisAlignedBB cbb = AxisAlignedBB.getBoundingBox(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + public AxisAlignedBB getRenderBoundingBox() { + AxisAlignedBB cbb = + AxisAlignedBB.getBoundingBox(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); return cbb; } @Override - public String getInventoryName () - { + public String getInventoryName() { return null; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public void closeInventory () - { + public void closeInventory() { // TODO Auto-generated method stub } @Override - public void openInventory () - { + public void openInventory() { // TODO Auto-generated method stub } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index fc8994d3412..c37b2bc6318 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -13,20 +13,17 @@ import tconstruct.world.entity.KingBlueSlime; import tconstruct.world.entity.SlimeBase; -public class SlimeFluid extends BlockFluidClassic -{ +public class SlimeFluid extends BlockFluidClassic { IIcon stillIcon; IIcon flowIcon; - public SlimeFluid(Fluid fluid, Material material) - { + public SlimeFluid(Fluid fluid, Material material) { super(fluid, material); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:slime_blue"); flowIcon = iconRegister.registerIcon("tinker:slime_blue_flow"); TinkerWorld.blueSlimeFluid.setStillIcon(stillIcon); @@ -35,31 +32,25 @@ public void registerBlockIcons (IIconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (side == 0 || side == 1) - return stillIcon; + public IIcon getIcon(int side, int meta) { + if (side == 0 || side == 1) return stillIcon; return flowIcon; } @Override - public void updateTick (World world, int x, int y, int z, Random rand) - { + public void updateTick(World world, int x, int y, int z, Random rand) { super.updateTick(world, x, y, z, rand); - if (rand.nextInt(100) == 0 && world.getBlockMetadata(x, y, z) == 0 && world.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2))) - { + if (rand.nextInt(100) == 0 + && world.getBlockMetadata(x, y, z) == 0 + && world.checkNoEntityCollision( + AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2))) { SlimeBase slime; - if(rand.nextInt(300) == 0) - slime = new KingBlueSlime(world); - else - slime = new BlueSlime(world); + if (rand.nextInt(300) == 0) slime = new KingBlueSlime(world); + else slime = new BlueSlime(world); slime.setPosition((double) x + 0.5D, (double) y + 1.5D, (double) z + 0.5D); world.spawnEntityInWorld(slime); } } - public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) - { - - } + public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) {} } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 69e4781323e..98f1d802fc0 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -13,45 +13,42 @@ import tconstruct.blocks.TConstructBlock; import tconstruct.library.TConstructRegistry; -public class SlimeGel extends TConstructBlock -{ - public SlimeGel() - { - super(Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); +public class SlimeGel extends TConstructBlock { + public SlimeGel() { + super(Material.sponge, 0.5f, new String[] {"slimeblock_blue", "slimeblock_green", "slimeblock_purple"}); setCreativeTab(TConstructRegistry.blockTab); } @Override - public boolean getEnableStats () - { + public boolean getEnableStats() { return false; } @Override - public int getMobilityFlag () - { + public int getMobilityFlag() { return 0; } @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { return meta; } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (entity.motionY < 0) - { - if (entity.motionY < -0.08F) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity.motionY < 0) { + if (entity.motionY < -0.08F) { Block var9 = (Block) this; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.soundName, (var9.stepSound.getVolume()) / 2.0F, var9.stepSound.getPitch() * 0.65F); + world.playSoundEffect( + x + 0.5F, + y + 0.5F, + z + 0.5F, + var9.stepSound.soundName, + (var9.stepSound.getVolume()) / 2.0F, + var9.stepSound.getPitch() * 0.65F); } entity.motionY *= -1.2F; - if (entity instanceof EntityLivingBase) - { + if (entity instanceof EntityLivingBase) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 2)); } } @@ -59,8 +56,7 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); } @@ -68,15 +64,13 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ - public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List) - { + public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(b, 1, 0)); par3List.add(new ItemStack(b, 1, 1)); // par3List.add(new ItemStack(par1, 1, 2)); } - public boolean canSustainLeaves (World world, int x, int y, int z) - { + public boolean canSustainLeaves(World world, int x, int y, int z) { return true; } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 40c0c85b5cb..427ba36886d 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -16,14 +16,14 @@ import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -public class SlimeGrass extends MantleBlock -{ - public String[] textureNames = { "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", "slimegrass_green_dirt_side" };// green, - // purple +public class SlimeGrass extends MantleBlock { + public String[] textureNames = { + "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", "slimegrass_green_dirt_side" + }; // green, + // purple public IIcon[] icons; - public SlimeGrass() - { + public SlimeGrass() { super(Material.grass); setHardness(0.6f); this.setTickRandomly(true); @@ -31,11 +31,9 @@ public SlimeGrass() } @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { if (meta == 1) // dirt - return 0; - + return 0; else // slime dirt return 5; @@ -43,90 +41,71 @@ public int damageDropped (int meta) @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta >= 2) - meta = 0; + public IIcon getIcon(int side, int meta) { + if (meta >= 2) meta = 0; - if (side == 0) - { + if (side == 0) { return meta % 2 == 1 ? Blocks.dirt.getIcon(0, 0) : icons[1]; - } - else if (side == 1) - { + } else if (side == 1) { return icons[0]; - } - else - { + } else { return icons[meta + 2]; } } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 1; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < 1; iter++) { list.add(new ItemStack(b, 1, iter)); } } @Override - public boolean canSustainPlant (IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plant) - { + public boolean canSustainPlant( + IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { EnumPlantType plantType = plant.getPlantType(world, x, y + 1, z); return plantType == EnumPlantType.Plains && plant.getPlant(world, x, y + 1, z) != Blocks.tallgrass; } @Override - public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) - { + public void onPlantGrow(World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { world.setBlock(x, y, z, TinkerTools.craftedSoil, 5, 3); } @Override - public void updateTick (World world, int x, int y, int z, Random random) - { - if (!world.isRemote) - { - if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) - { + public void updateTick(World world, int x, int y, int z, Random random) { + if (!world.isRemote) { + if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) { world.setBlock(x, y, z, TinkerTools.craftedSoil, 5, 3); - } - else if (world.getBlockLightValue(x, y + 1, z) >= 9) - { - for (int l = 0; l < 4; ++l) - { + } else if (world.getBlockLightValue(x, y + 1, z) >= 9) { + for (int l = 0; l < 4; ++l) { int posX = x + random.nextInt(3) - 1; int posY = y + random.nextInt(5) - 3; int posZ = z + random.nextInt(3) - 1; Block blockAbove = world.getBlock(posX, posY + 1, posZ); - if (world.getBlockLightValue(posX, posY + 1, posZ) >= 4 && world.getBlockLightOpacity(posX, posY + 1, posZ) <= 2 && blockAbove != TinkerTools.craftedSoil && blockAbove != this) - { + if (world.getBlockLightValue(posX, posY + 1, posZ) >= 4 + && world.getBlockLightOpacity(posX, posY + 1, posZ) <= 2 + && blockAbove != TinkerTools.craftedSoil + && blockAbove != this) { Block block = world.getBlock(posX, posY, posZ); - if (block == Blocks.dirt) - { + if (block == Blocks.dirt) { world.setBlock(posX, posY, posZ, (Block) this, 1, 3); return; } int blockMeta = world.getBlockMetadata(posX, posY, posZ); - if (block == TinkerTools.craftedSoil) - { - if (blockMeta == 5) - world.setBlock(posX, posY, posZ, (Block) this, 0, 3); + if (block == TinkerTools.craftedSoil) { + if (blockMeta == 5) world.setBlock(posX, posY, posZ, (Block) this, 0, 3); } } } @@ -134,19 +113,14 @@ else if (world.getBlockLightValue(x, y + 1, z) >= 9) } } - public Block blockDropped (int metadata, Random random, int fortune) - { - if (metadata == 1) - return Blocks.dirt; - else - return TinkerTools.craftedSoil; + public Block blockDropped(int metadata, Random random, int fortune) { + if (metadata == 1) return Blocks.dirt; + else return TinkerTools.craftedSoil; } @Override public Item getItemDropped(int metadata, Random random, int p_149650_3_) { - if (metadata == 1) - return Blocks.dirt.getItemDropped(metadata, random, p_149650_3_); - else - return ItemSaddle.getItemFromBlock(TinkerTools.craftedSoil); + if (metadata == 1) return Blocks.dirt.getItemDropped(metadata, random, p_149650_3_); + else return ItemSaddle.getItemFromBlock(TinkerTools.craftedSoil); } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 35761aef0ca..edc78e580d3 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -12,17 +12,17 @@ import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; -public class SlimeLeaves extends BlockLeaves -{ - private static final String[] fastLeaves = new String[] { "slimeleaves_blue_fast" }; - private static final String[] fancyLeaves = new String[] { "slimeleaves_blue_fancy" }; +public class SlimeLeaves extends BlockLeaves { + private static final String[] fastLeaves = new String[] {"slimeleaves_blue_fast"}; + private static final String[] fancyLeaves = new String[] {"slimeleaves_blue_fancy"}; + @SideOnly(Side.CLIENT) private IIcon[] fastIcons; + @SideOnly(Side.CLIENT) private IIcon[] fancyIcons; - public SlimeLeaves() - { + public SlimeLeaves() { super(); setCreativeTab(TConstructRegistry.blockTab); setLightOpacity(1); @@ -31,34 +31,29 @@ public SlimeLeaves() @Override @SideOnly(Side.CLIENT) - public int getBlockColor () - { + public int getBlockColor() { return 0xffffff; } @Override @SideOnly(Side.CLIENT) - public int getRenderColor (int par1) - { + public int getRenderColor(int par1) { return 0xffffff; } @Override @SideOnly(Side.CLIENT) - public int colorMultiplier (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { + public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { return 0xffffff; } @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.fastIcons = new IIcon[fastLeaves.length]; this.fancyIcons = new IIcon[fancyLeaves.length]; - for (int i = 0; i < this.fastIcons.length; i++) - { + for (int i = 0; i < this.fastIcons.length; i++) { this.fastIcons[i] = iconRegister.registerIcon("tinker:" + fastLeaves[i]); this.fancyIcons[i] = iconRegister.registerIcon("tinker:" + fancyLeaves[i]); } @@ -66,28 +61,22 @@ public void registerBlockIcons (IIconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { int tex = meta % 1; this.setGraphicsLevel(Minecraft.getMinecraft().gameSettings.fancyGraphics); - if (this.field_150121_P) - return fancyIcons[tex]; - else - return fastIcons[tex]; + if (this.field_150121_P) return fancyIcons[tex]; + else return fastIcons[tex]; } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < fastIcons.length; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < fastIcons.length; iter++) { list.add(new ItemStack(id, 1, iter)); } } @Override - public boolean isLeaves (IBlockAccess world, int x, int y, int z) - { + public boolean isLeaves(IBlockAccess world, int x, int y, int z) { return true; } @@ -97,8 +86,7 @@ public boolean isLeaves (IBlockAccess world, int x, int y, int z) * Returns the ID of the items to drop on destruction. */ @Override - public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_) - { + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { return Item.getItemFromBlock(TinkerWorld.slimeSapling); } @@ -106,10 +94,8 @@ public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_ * Drops the block items with a specified chance of dropping the specified items */ @Override - public void dropBlockAsItemWithChance (World world, int x, int y, int z, int meta, float chance, int fortune) - { - if (!world.isRemote) - { + public void dropBlockAsItemWithChance(World world, int x, int y, int z, int meta, float chance, int fortune) { + if (!world.isRemote) { int dropChance = 35; /*if ((meta & 3) == 3) @@ -117,44 +103,37 @@ public void dropBlockAsItemWithChance (World world, int x, int y, int z, int met j1 = 40; }*/ - if (fortune > 0) - { + if (fortune > 0) { dropChance -= 2 << fortune; - if (dropChance < 15) - { + if (dropChance < 15) { dropChance = 15; } } - if (world.rand.nextInt(dropChance) == 0) - { + if (world.rand.nextInt(dropChance) == 0) { Item k1 = this.getItemDropped(meta, world.rand, fortune); this.dropBlockAsItem(world, x, y, z, new ItemStack(k1, 1, this.damageDropped(meta))); } dropChance = 80; - if (fortune > 0) - { + if (fortune > 0) { dropChance -= 10 << fortune; - if (dropChance < 20) - { + if (dropChance < 20) { dropChance = 20; } } - if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0) - { + if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0) { this.dropBlockAsItem(world, x, y, z, new ItemStack(TinkerWorld.strangeFood, 1, 0)); } } } @Override - public String[] func_150125_e () - { - return new String[] { "slime" }; + public String[] func_150125_e() { + return new String[] {"slime"}; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index c0b872b5d8a..7eeed16ee04 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -16,13 +16,11 @@ import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeTreeGen; -public class SlimeSapling extends BlockSapling -{ +public class SlimeSapling extends BlockSapling { public IIcon[] icons; - public String[] textureNames = new String[] { "blue" }; + public String[] textureNames = new String[] {"blue"}; - public SlimeSapling() - { + public SlimeSapling() { super(); float f = 0.4F; setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); @@ -33,95 +31,74 @@ public SlimeSapling() @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:slimesapling_" + textureNames[i]); } } @Override - public boolean canPlaceBlockOn (Block id) - { + public boolean canPlaceBlockOn(Block id) { return id == Blocks.grass || id == Blocks.dirt || id == TinkerWorld.slimeGrass || id == TinkerTools.craftedSoil; } @Override - public void updateTick (World world, int x, int y, int z, Random random) - { - if (world.isRemote) - { + public void updateTick(World world, int x, int y, int z, Random random) { + if (world.isRemote) { return; } super.updateTick(world, x, y, z, random); int md = world.getBlockMetadata(x, y, z); - if (random.nextInt(10) == 0 && world.getBlockLightValue(x, y + 1, z) >= 9) - { - if ((md & 8) == 0) - world.setBlockMetadataWithNotify(x, y, z, md | 8, 4); - - else - growTree(world, x, y, z, random); + if (random.nextInt(10) == 0 && world.getBlockLightValue(x, y + 1, z) >= 9) { + if ((md & 8) == 0) world.setBlockMetadataWithNotify(x, y, z, md | 8, 4); + else growTree(world, x, y, z, random); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return icons[meta % icons.length]; } @Override - public void func_149879_c (World world, int x, int y, int z, Random random) - { + public void func_149879_c(World world, int x, int y, int z, Random random) { boneFertilize(world, x, y, z, random, null); } - public boolean boneFertilize (World world, int x, int y, int z, Random random, EntityPlayer player) - { + public boolean boneFertilize(World world, int x, int y, int z, Random random, EntityPlayer player) { int meta = world.getBlockMetadata(x, y, z); - if (meta % 8 == 0 && (player == null || !player.capabilities.isCreativeMode)) - return false; + if (meta % 8 == 0 && (player == null || !player.capabilities.isCreativeMode)) return false; - if ((meta & 8) == 0) - { + if ((meta & 8) == 0) { world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); - } - else - { + } else { this.growTree(world, x, y, z, random); } return true; } - public void growTree (World world, int x, int y, int z, Random random) - { + public void growTree(World world, int x, int y, int z, Random random) { int md = world.getBlockMetadata(x, y, z) % 8; world.setBlock(x, y, z, Blocks.air); WorldGenerator obj = null; obj = new SlimeTreeGen(true, 5, 4, 1, 0); - if (!(obj.generate(world, random, x, y, z))) - world.setBlock(x, y, z, this, md + 8, 3); + if (!(obj.generate(world, random, x, y, z))) world.setBlock(x, y, z, this, md + 8, 3); } - public int damageDropped (int i) - { + public int damageDropped(int i) { return i % 8; } @SideOnly(Side.CLIENT) @Override - public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3List) - { - for (int i = 0; i < 1; i++) - par3List.add(new ItemStack(par1, 1, i)); + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int i = 0; i < 1; i++) par3List.add(new ItemStack(par1, 1, i)); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index aff317d181a..f53e0b678a8 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -13,14 +13,13 @@ import net.minecraftforge.common.*; import tconstruct.library.TConstructRegistry; -public class SlimeTallGrass extends BlockBush implements IShearable -{ - private static final String[] grassTypes = new String[] { "slimegrass_blue_tall" }; +public class SlimeTallGrass extends BlockBush implements IShearable { + private static final String[] grassTypes = new String[] {"slimegrass_blue_tall"}; + @SideOnly(Side.CLIENT) private IIcon[] iconArray; - public SlimeTallGrass() - { + public SlimeTallGrass() { super(Material.vine); float f = 0.4F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); @@ -32,17 +31,15 @@ public SlimeTallGrass() /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public IIcon getIcon (int side, int meta) - { - meta = MathHelper.clamp_int(meta, 0, iconArray.length-1); + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, iconArray.length - 1); return this.iconArray[meta]; } /** * Returns the ID of the items to drop on destruction. */ - public int idDropped (int par1, Random par2Random, int par3) - { + public int idDropped(int par1, Random par2Random, int par3) { return -1; } @@ -51,8 +48,7 @@ public int idDropped (int par1, Random par2Random, int par3) * (inclusive). */ @Override - public int quantityDroppedWithBonus (int par1, Random par2Random) - { + public int quantityDroppedWithBonus(int par1, Random par2Random) { return 1 + par2Random.nextInt(par1 * 2 + 1); } @@ -60,8 +56,7 @@ public int quantityDroppedWithBonus (int par1, Random par2Random) * Get the block's damage value (for use with pick block). */ @Override - public int getDamageValue (World par1World, int par2, int par3, int par4) - { + public int getDamageValue(World par1World, int par2, int par3, int par4) { return par1World.getBlockMetadata(par2, par3, par4); } @@ -69,10 +64,8 @@ public int getDamageValue (World par1World, int par2, int par3, int par4) /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ - public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List) - { - for (int j = 0; j < 1; ++j) - { + public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < 1; ++j) { par3List.add(new ItemStack(b, 1, j)); } } @@ -83,42 +76,35 @@ public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List) * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void registerBlockIcons (IIconRegister par1IconRegister) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { this.iconArray = new IIcon[grassTypes.length]; - for (int i = 0; i < this.iconArray.length; ++i) - { + for (int i = 0; i < this.iconArray.length; ++i) { this.iconArray[i] = par1IconRegister.registerIcon("tinker:" + grassTypes[i]); } } @Override - public ArrayList getDrops (World world, int x, int y, int z, int meta, int fortune) - { + public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { ArrayList ret = new ArrayList(); - if (world.rand.nextInt(8) != 0) - { + if (world.rand.nextInt(8) != 0) { return ret; } ItemStack item = ForgeHooks.getGrassSeed(world); - if (item != null) - { + if (item != null) { ret.add(item); } return ret; } @Override - public boolean isShearable (ItemStack item, IBlockAccess world, int x, int y, int z) - { + public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { return true; } @Override - public ArrayList onSheared (ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) - { + public ArrayList onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { ArrayList ret = new ArrayList(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z))); return ret; diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 1351dbf54bf..6950c10b5a0 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -13,13 +13,11 @@ import tconstruct.library.TConstructRegistry; import tconstruct.world.model.BarricadeRender; -public class BarricadeBlock extends MantleBlock -{ +public class BarricadeBlock extends MantleBlock { Block modelBlock; int modelMeta; - public BarricadeBlock(Block model, int meta) - { + public BarricadeBlock(Block model, int meta) { super(Material.wood); this.modelBlock = model; this.modelMeta = meta; @@ -29,79 +27,69 @@ public BarricadeBlock(Block model, int meta) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return modelBlock.getIcon(2, modelMeta); } @Override - public void registerBlockIcons (IIconRegister par1IconRegister) - { - - } + public void registerBlockIcons(IIconRegister par1IconRegister) {} @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderType () - { + public int getRenderType() { return BarricadeRender.model; } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int x, int y, int z) { return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); } @Override - public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int x, int y, int z) - { + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int x, int y, int z) { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @Override - public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) - { - if (meta % 4 > 0) - { + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { + if (meta % 4 > 0) { world.setBlock(x, y, z, this, meta - 1, 3); dropBlockAsItem(world, x, y, z, new ItemStack(this)); - } - else - { + } else { dropBlockAsItem(world, x, y, z, new ItemStack(this)); } } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) - { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { ItemStack stack = player.getCurrentEquippedItem(); - if ((stack != null) && (stack.getItem() == Item.getItemFromBlock(this)) && (!player.isSneaking())) - { + if ((stack != null) && (stack.getItem() == Item.getItemFromBlock(this)) && (!player.isSneaking())) { int meta = world.getBlockMetadata(x, y, z); - if (meta % 4 != 3) - { + if (meta % 4 != 3) { world.setBlock(x, y, z, this, meta + 1, 3); this.onBlockPlacedBy(world, x, y, z, player, stack); this.onPostBlockPlaced(world, x, y, z, meta); Block var9 = this; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.soundName, (var9.stepSound.getVolume() + 1.0F) / 2.0F, var9.stepSound.getPitch() * 0.8F); + world.playSoundEffect( + x + 0.5F, + y + 0.5F, + z + 0.5F, + var9.stepSound.soundName, + (var9.stepSound.getVolume() + 1.0F) / 2.0F, + var9.stepSound.getPitch() * 0.8F); player.swingItem(); - if (!player.capabilities.isCreativeMode) - stack.stackSize -= 1; + if (!player.capabilities.isCreativeMode) stack.stackSize -= 1; return true; } @@ -110,25 +98,21 @@ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer } @Override - public void onBlockExploded (World world, int x, int y, int z, Explosion explosion) - { + public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { double distance = (x - explosion.explosionX) + (y - explosion.explosionY) + (z - explosion.explosionZ); distance = Math.abs(distance); double power = (explosion.explosionSize * 2) / distance; int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 4; trueMeta -= power; - if (trueMeta < 0) - world.setBlock(x, y, z, Blocks.air, 0, 0); - else - world.setBlockMetadataWithNotify(x, y, z, (int) (meta - power), 3); + if (trueMeta < 0) world.setBlock(x, y, z, Blocks.air, 0, 0); + else world.setBlockMetadataWithNotify(x, y, z, (int) (meta - power), 3); onBlockDestroyedByExplosion(world, x, y, z, explosion); } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) - { + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } } diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index f44b4612738..280ca1c31cf 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -13,13 +13,11 @@ import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; -public class Landmine extends MantleBlock -{ +public class Landmine extends MantleBlock { /** The mob type that can trigger this pressure plate. */ private EnumCreatureType triggerMobType; - public Landmine(EnumCreatureType par3EnumCreatureType, Material par4Material) - { + public Landmine(EnumCreatureType par3EnumCreatureType, Material par4Material) { super(par4Material); this.triggerMobType = EnumCreatureType.monster; this.setCreativeTab(TConstructRegistry.blockTab); @@ -30,11 +28,9 @@ public Landmine(EnumCreatureType par3EnumCreatureType, Material par4Material) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) - { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { Block block = world.getBlock(x, y - 1, z); - if (block != null) - { + if (block != null) { return block.getIcon(world, x, y - 1, z, side); } return Blocks.sponge.getIcon(side, world.getBlockMetadata(x, y, z)); @@ -42,22 +38,17 @@ public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return Blocks.sponge.getIcon(1, meta); } @Override - public void registerBlockIcons (IIconRegister par1IconRegister) - { - - } + public void registerBlockIcons(IIconRegister par1IconRegister) {} /** * How many world ticks before ticking */ - public int tickRate () - { + public int tickRate() { return 20; } @@ -66,8 +57,7 @@ public int tickRate () * box can change after the pool has been cleared to be reused) */ @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { return null; } @@ -77,8 +67,7 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, * the player can attach torches, redstone wire, etc to this block. */ @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @@ -87,14 +76,12 @@ public boolean isOpaqueCube () * (examples: signs, buttons, stairs, etc) */ @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { + public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { return true; } @@ -103,9 +90,9 @@ public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int p * coordinates. Args: world, x, y, z */ @Override - public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) - { - return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4)); + public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { + return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) + || BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4)); } /** @@ -113,17 +100,15 @@ public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) * neighbor changed (coordinates passed are their own) Args: x, y, z, * neighbor blockID */ - public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5) - { + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) { boolean var6 = false; - if (!par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) && !BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4))) - { + if (!par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) + && !BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4))) { var6 = true; } - if (var6) - { + if (var6) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); // par1World.setBlock(par2, par3, par4, 0); } @@ -133,12 +118,9 @@ public void onNeighborBlockChange (World par1World, int par2, int par3, int par4 * Ticks the block if it's been scheduled */ @Override - public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) - { - if (!par1World.isRemote) - { - if (par1World.getBlockMetadata(par2, par3, par4) != 0) - { + public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { + if (!par1World.isRemote) { + if (par1World.getBlockMetadata(par2, par3, par4) != 0) { this.setStateIfMobInteractsWithPlate(par1World, par2, par3, par4); } } @@ -149,12 +131,9 @@ public void updateTick (World par1World, int par2, int par3, int par4, Random pa * block). Args: world, x, y, z, entity */ @Override - public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity) - { - if (!par1World.isRemote) - { - if (par1World.getBlockMetadata(par2, par3, par4) != 1) - { + public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { + if (!par1World.isRemote) { + if (par1World.getBlockMetadata(par2, par3, par4) != 1) { this.setStateIfMobInteractsWithPlate(par1World, par2, par3, par4); } } @@ -164,21 +143,34 @@ public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int * Checks if there are mobs on the plate. If a mob is on the plate and it is * off, it turns it on, and vice versa. */ - private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, int posZ) - { + private void setStateIfMobInteractsWithPlate(World world, int posX, int posY, int posZ) { boolean var5 = world.getBlockMetadata(posX, posY, posZ) == 1; boolean var6 = false; float var7 = 0.125F; List var8 = null; - if (this.triggerMobType == EnumCreatureType.creature) - { - var8 = world.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ + 1) - var7))); + if (this.triggerMobType == EnumCreatureType.creature) { + var8 = world.getEntitiesWithinAABBExcludingEntity( + (Entity) null, + AxisAlignedBB.getBoundingBox( + (double) ((float) posX + var7), + (double) posY, + (double) ((float) posZ + var7), + (double) ((float) (posX + 1) - var7), + (double) posY + 0.25D, + (double) ((float) (posZ + 1) - var7))); } - if (this.triggerMobType == EnumCreatureType.monster) - { - var8 = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ + 1) - var7))); + if (this.triggerMobType == EnumCreatureType.monster) { + var8 = world.getEntitiesWithinAABB( + EntityLiving.class, + AxisAlignedBB.getBoundingBox( + (double) ((float) posX + var7), + (double) posY, + (double) ((float) posZ + var7), + (double) ((float) (posX + 1) - var7), + (double) posY + 0.25D, + (double) ((float) (posZ + 1) - var7))); } /* @@ -190,24 +182,20 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i * 1) - var7))); } */ - if (!var8.isEmpty()) - { + if (!var8.isEmpty()) { Iterator var9 = var8.iterator(); - while (var9.hasNext()) - { + while (var9.hasNext()) { Entity var10 = (Entity) var9.next(); - if (!var10.doesEntityNotTriggerPressurePlate()) - { + if (!var10.doesEntityNotTriggerPressurePlate()) { var6 = true; break; } } } - if (var6 && !var5) - { + if (var6 && !var5) { WorldHelper.setBlockToAir(world, posX, posY, posZ); world.createExplosion((Entity) null, posX, posY, posZ, 2.0F, true); /* @@ -230,7 +218,7 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i * posY, posZ, posX, posY, posZ); par1World.playSoundEffect((double)posX * + 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", * 0.3F, 0.5F); } - * + * * if (var6) { par1World.scheduleBlockUpdate(posX, posY, posZ, * this.blockID, this.tickRate()); } */ @@ -241,10 +229,8 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i * update, as appropriate */ @Override - public void breakBlock (World par1World, int par2, int par3, int par4, Block par5, int par6) - { - if (par6 > 0) - { + public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { + if (par6 > 0) { par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this); par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this); } @@ -257,17 +243,13 @@ public void breakBlock (World par1World, int par2, int par3, int par4, Block par * z */ @Override - public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { boolean var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 1; float var6 = 0.0625F; - if (var5) - { + if (var5) { this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 0.03125F, 1.0F - var6); - } - else - { + } else { this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 0.0625F, 1.0F - var6); } } @@ -276,8 +258,7 @@ public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, * Sets the block's bounds for rendering it as an item */ @Override - public void setBlockBoundsForItemRender () - { + public void setBlockBoundsForItemRender() { float var1 = 0.5F; float var2 = 0.125F; float var3 = 0.5F; @@ -289,8 +270,7 @@ public void setBlockBoundsForItemRender () * but can move over, 2 = total immobility and stop pistons */ @Override - public int getMobilityFlag () - { + public int getMobilityFlag() { return 1; } } diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 97de118fa73..b2b77429800 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -16,11 +16,9 @@ import tconstruct.world.TinkerWorld; import tconstruct.world.model.PunjiRender; -public class Punji extends MantleBlock -{ +public class Punji extends MantleBlock { - public Punji() - { + public Punji() { super(Material.plants); this.setBlockBounds(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f); this.stepSound = Block.soundTypeGrass; @@ -29,13 +27,10 @@ public Punji() } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (entity instanceof EntityLivingBase) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity instanceof EntityLivingBase) { int damage = world.getBlockMetadata(x, y, z) / 2 + 1; - if (entity.fallDistance > 0) - damage += ((entity.fallDistance) * 1.5 + 2); + if (entity.fallDistance > 0) damage += ((entity.fallDistance) * 1.5 + 2); entity.attackEntityFrom(DamageSource.cactus, damage); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 20, 1)); } @@ -43,26 +38,28 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity /* Right-click adds sticks */ @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) - { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) { /* * if (world.isRemote) return false; */ int meta = world.getBlockMetadata(x, y, z); - if (meta < 4) - { + if (meta < 4) { ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerWorld.punji)) - { + if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerWorld.punji)) { world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3); - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F); + world.playSoundEffect( + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + this.stepSound.soundName, + (this.stepSound.getVolume() + 1.0F) / 2.0F, + this.stepSound.getPitch() * 0.8F); player.swingItem(); - if (!player.capabilities.isCreativeMode) - { + if (!player.capabilities.isCreativeMode) { stack.stackSize--; - if (stack.stackSize <= 0) - player.destroyCurrentEquippedItem(); + if (stack.stackSize <= 0) player.destroyCurrentEquippedItem(); } } } @@ -70,8 +67,7 @@ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer } @Override - public int quantityDropped (int meta, int fortune, Random random) - { + public int quantityDropped(int meta, int fortune, Random random) { return meta + 1; } @@ -81,8 +77,7 @@ public int quantityDropped (int meta, int fortune, Random random) * the player can attach torches, redstone wire, etc to this block. */ @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @@ -91,29 +86,24 @@ public boolean isOpaqueCube () * (examples: signs, buttons, stairs, etc) */ @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public int getRenderType () - { + public int getRenderType() { return PunjiRender.model; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.blockIcon = iconRegister.registerIcon("tinker:punji"); } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) - { + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } - } diff --git a/src/main/java/tconstruct/client/AmmoItemRenderer.java b/src/main/java/tconstruct/client/AmmoItemRenderer.java index 13d048c6733..d9666e7986d 100644 --- a/src/main/java/tconstruct/client/AmmoItemRenderer.java +++ b/src/main/java/tconstruct/client/AmmoItemRenderer.java @@ -1,23 +1,24 @@ package tconstruct.client; -import tconstruct.library.weaponry.IAmmo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import tconstruct.library.weaponry.IAmmo; public class AmmoItemRenderer extends FlexibleToolRenderer { - //public static FontRenderer fontRenderer; + // public static FontRenderer fontRenderer; public AmmoItemRenderer() { -// super(true); - //fontRenderer = new FontRenderer(Minecraft.getMinecraft().gameSettings, new ResourceLocation(Reference.RESOURCE, "textures/font/border_numbers.png"), Minecraft.getMinecraft().renderEngine, false); + // super(true); + // fontRenderer = new FontRenderer(Minecraft.getMinecraft().gameSettings, new + // ResourceLocation(Reference.RESOURCE, "textures/font/border_numbers.png"), + // Minecraft.getMinecraft().renderEngine, false); } @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - if(type == ItemRenderType.INVENTORY) - return true; + if (type == ItemRenderType.INVENTORY) return true; return super.handleRenderType(item, type); } @@ -26,19 +27,17 @@ public boolean handleRenderType(ItemStack item, ItemRenderType type) { public void renderItem(ItemRenderType type, ItemStack item, Object... data) { // render the item regularly super.renderItem(type, item, data); - //RenderItem.getInstance().renderItemIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().renderEngine, item, 0,0); + // RenderItem.getInstance().renderItemIntoGUI(Minecraft.getMinecraft().fontRenderer, + // Minecraft.getMinecraft().renderEngine, item, 0,0); - if(item.getTagCompound() == null || type != ItemRenderType.INVENTORY) - return; + if (item.getTagCompound() == null || type != ItemRenderType.INVENTORY) return; // render custom stacksize renderAmmoCount(item); } - public void renderAmmoCount(ItemStack item) - { - if(!(item.getItem() instanceof IAmmo)) - return; + public void renderAmmoCount(ItemStack item) { + if (!(item.getItem() instanceof IAmmo)) return; int amount = ((IAmmo) item.getItem()).getAmmoCount(item); String str = String.valueOf(amount); diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index 9a2a0e8c374..4998cac4f5e 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -25,186 +25,188 @@ public class ArmorControls { - public static final String keybindCategory = "tconstruct.keybindings"; - public static final String[] keyDescs = new String[]{"key.tarmor", "key.tgoggles", "key.tbelt", "key.tzoom"}; - public static KeyBinding armorKey = new KeyBinding(keyDescs[0], 24, keybindCategory); - public static KeyBinding toggleGoggles = new KeyBinding(keyDescs[1], 34, keybindCategory); - public static KeyBinding beltSwap = new KeyBinding(keyDescs[2], 48, keybindCategory); - public static KeyBinding zoomKey = new KeyBinding(keyDescs[3], 44, keybindCategory); //TODO: Make this hold, not toggle - static KeyBinding jumpKey; - static KeyBinding invKey; - static Minecraft mc; - - boolean jumping; - int midairJumps = 0; - boolean climbing = false; - boolean onGround = false; - public static boolean zoom = false; - boolean activeGoggles = false; //TODO: Set this on server login - - int currentTab = 1; - // boolean onStilts = false; - - private final KeyBinding[] keys; - - public ArmorControls() { - getVanillaKeyBindings(); - keys = new KeyBinding[]{ - armorKey, - toggleGoggles, - beltSwap, - zoomKey, - null, null - }; - } - - public void registerKeys() { - // Register bindings - for (KeyBinding key : keys) { - if (key != null) { - ClientRegistry.registerKeyBinding(key); - } - } - if (Loader.isModLoaded("notenoughkeys")) { - Api.registerMod(TConstruct.modID, keyDescs); - } - // Add mc keys - keys[4] = jumpKey; - keys[5] = invKey; - } - - private static void getVanillaKeyBindings() { - mc = Minecraft.getMinecraft(); - jumpKey = mc.gameSettings.keyBindJump; - invKey = mc.gameSettings.keyBindInventory; - } - - @SubscribeEvent - public void keyEvent(KeyInputEvent event) { - if (!Loader.isModLoaded("notenoughkeys")) { - checkAndPerformKeyActions(null, false); - } - } - - @Optional.Method(modid = "notenoughkeys") - @SubscribeEvent - public void keyEventSpecial(KeyBindingPressedEvent event) { - if (event.keyBinding != null && event.isKeyBindingPressed) { - checkAndPerformKeyActions(event.keyBinding, true); - } - } - - private void checkAndPerformKeyActions(KeyBinding keyBinding, boolean inputFromNotEnoughKeys) { - if (inputFromNotEnoughKeys ? keyBinding == armorKey : armorKey.isPressed()) { - openArmorGui(); - return; - } - if (inputFromNotEnoughKeys ? keyBinding == jumpKey : jumpKey.isPressed()) { - performHigherJump(); - return; - } - if (mc.currentScreen == null) { - if (inputFromNotEnoughKeys ? keyBinding == toggleGoggles : toggleGoggles.isPressed()) { - checkAndToggleNightVision(); - return; - } - if (inputFromNotEnoughKeys ? keyBinding == beltSwap : beltSwap.isPressed()) { - doBeltSwapIfPossible(); - return; - } - if (inputFromNotEnoughKeys ? keyBinding == zoomKey : zoomKey.isPressed()) { - zoom = !zoom; - } - } - } - - private void performHigherJump() { - if (mc.thePlayer.capabilities.isCreativeMode) { - return; - } - if (jumping && midairJumps > 0) { - mc.thePlayer.motionY = 0.42D; - mc.thePlayer.fallDistance = 0; - if (mc.thePlayer.isPotionActive(Potion.jump)) { - mc.thePlayer.motionY += (float) (mc.thePlayer.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F; - } - midairJumps--; - resetFallDamage(); - } - if (!jumping) { - jumping = mc.thePlayer.isAirBorne; - ItemStack shoes = mc.thePlayer.getCurrentArmor(0); - if (shoes != null && shoes.hasTagCompound() && shoes.getTagCompound().hasKey("TinkerArmor")) { - NBTTagCompound shoeTag = shoes.getTagCompound().getCompoundTag("TinkerArmor"); - midairJumps += shoeTag.getInteger("Double-Jump"); - } - ItemStack wings = mc.thePlayer.getCurrentArmor(1); - if (wings != null && wings.hasTagCompound() && wings.getTagCompound().hasKey("TinkerArmor")) { - NBTTagCompound shoeTag = wings.getTagCompound().getCompoundTag("TinkerArmor"); - midairJumps += shoeTag.getInteger("Double-Jump"); - } - } - } - - private void checkAndToggleNightVision() { - ItemStack goggles = mc.thePlayer.getCurrentArmor(3); - if (goggles != null && goggles.getItem() instanceof TravelGear) { // TODO: Genericize this - if (goggles.hasTagCompound() && goggles.getTagCompound().getCompoundTag(((TravelGear) goggles.getItem()).getBaseTagName()).getBoolean("Night Vision")) { - activeGoggles = !activeGoggles; - PlayerAbilityHelper.toggleGoggles(mc.thePlayer, activeGoggles); - toggleGoggles(); - } - } - } - - public static boolean doBeltSwapIfPossible() { - if (ArmorProxyClient.armorExtended.inventory[3] != null) { - PlayerAbilityHelper.swapBelt(mc.thePlayer, ArmorProxyClient.armorExtended); - toggleBelt(); - return true; - } - return false; - } - - public void landOnGround() { - midairJumps = 0; - jumping = false; - } - - public void resetControls() { - midairJumps = 0; - jumping = false; - climbing = false; - onGround = false; - } - - void resetFallDamage() { - AbstractPacket packet = new DoubleJumpPacket(); - updateServer(packet); - } - - public static void openArmorGui() { - AbstractPacket packet = new AccessoryInventoryPacket(ArmorProxyCommon.armorGuiID); - updateServer(packet); - } - - public static void openKnapsackGui() { - AbstractPacket packet = new AccessoryInventoryPacket(ArmorProxyCommon.knapsackGuiID); - updateServer(packet); - } - - private void toggleGoggles() { - AbstractPacket packet = new GogglePacket(activeGoggles); - updateServer(packet); - } - - private static void toggleBelt() { - AbstractPacket packet = new BeltPacket(); - updateServer(packet); - } - - static void updateServer(AbstractPacket abstractPacket) { - TConstruct.packetPipeline.sendToServer(abstractPacket); - } - + public static final String keybindCategory = "tconstruct.keybindings"; + public static final String[] keyDescs = new String[] {"key.tarmor", "key.tgoggles", "key.tbelt", "key.tzoom"}; + public static KeyBinding armorKey = new KeyBinding(keyDescs[0], 24, keybindCategory); + public static KeyBinding toggleGoggles = new KeyBinding(keyDescs[1], 34, keybindCategory); + public static KeyBinding beltSwap = new KeyBinding(keyDescs[2], 48, keybindCategory); + public static KeyBinding zoomKey = + new KeyBinding(keyDescs[3], 44, keybindCategory); // TODO: Make this hold, not toggle + static KeyBinding jumpKey; + static KeyBinding invKey; + static Minecraft mc; + + boolean jumping; + int midairJumps = 0; + boolean climbing = false; + boolean onGround = false; + public static boolean zoom = false; + boolean activeGoggles = false; // TODO: Set this on server login + + int currentTab = 1; + // boolean onStilts = false; + + private final KeyBinding[] keys; + + public ArmorControls() { + getVanillaKeyBindings(); + keys = new KeyBinding[] {armorKey, toggleGoggles, beltSwap, zoomKey, null, null}; + } + + public void registerKeys() { + // Register bindings + for (KeyBinding key : keys) { + if (key != null) { + ClientRegistry.registerKeyBinding(key); + } + } + if (Loader.isModLoaded("notenoughkeys")) { + Api.registerMod(TConstruct.modID, keyDescs); + } + // Add mc keys + keys[4] = jumpKey; + keys[5] = invKey; + } + + private static void getVanillaKeyBindings() { + mc = Minecraft.getMinecraft(); + jumpKey = mc.gameSettings.keyBindJump; + invKey = mc.gameSettings.keyBindInventory; + } + + @SubscribeEvent + public void keyEvent(KeyInputEvent event) { + if (!Loader.isModLoaded("notenoughkeys")) { + checkAndPerformKeyActions(null, false); + } + } + + @Optional.Method(modid = "notenoughkeys") + @SubscribeEvent + public void keyEventSpecial(KeyBindingPressedEvent event) { + if (event.keyBinding != null && event.isKeyBindingPressed) { + checkAndPerformKeyActions(event.keyBinding, true); + } + } + + private void checkAndPerformKeyActions(KeyBinding keyBinding, boolean inputFromNotEnoughKeys) { + if (inputFromNotEnoughKeys ? keyBinding == armorKey : armorKey.isPressed()) { + openArmorGui(); + return; + } + if (inputFromNotEnoughKeys ? keyBinding == jumpKey : jumpKey.isPressed()) { + performHigherJump(); + return; + } + if (mc.currentScreen == null) { + if (inputFromNotEnoughKeys ? keyBinding == toggleGoggles : toggleGoggles.isPressed()) { + checkAndToggleNightVision(); + return; + } + if (inputFromNotEnoughKeys ? keyBinding == beltSwap : beltSwap.isPressed()) { + doBeltSwapIfPossible(); + return; + } + if (inputFromNotEnoughKeys ? keyBinding == zoomKey : zoomKey.isPressed()) { + zoom = !zoom; + } + } + } + + private void performHigherJump() { + if (mc.thePlayer.capabilities.isCreativeMode) { + return; + } + if (jumping && midairJumps > 0) { + mc.thePlayer.motionY = 0.42D; + mc.thePlayer.fallDistance = 0; + if (mc.thePlayer.isPotionActive(Potion.jump)) { + mc.thePlayer.motionY += + (float) (mc.thePlayer.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F; + } + midairJumps--; + resetFallDamage(); + } + if (!jumping) { + jumping = mc.thePlayer.isAirBorne; + ItemStack shoes = mc.thePlayer.getCurrentArmor(0); + if (shoes != null + && shoes.hasTagCompound() + && shoes.getTagCompound().hasKey("TinkerArmor")) { + NBTTagCompound shoeTag = shoes.getTagCompound().getCompoundTag("TinkerArmor"); + midairJumps += shoeTag.getInteger("Double-Jump"); + } + ItemStack wings = mc.thePlayer.getCurrentArmor(1); + if (wings != null + && wings.hasTagCompound() + && wings.getTagCompound().hasKey("TinkerArmor")) { + NBTTagCompound shoeTag = wings.getTagCompound().getCompoundTag("TinkerArmor"); + midairJumps += shoeTag.getInteger("Double-Jump"); + } + } + } + + private void checkAndToggleNightVision() { + ItemStack goggles = mc.thePlayer.getCurrentArmor(3); + if (goggles != null && goggles.getItem() instanceof TravelGear) { // TODO: Genericize this + if (goggles.hasTagCompound() + && goggles.getTagCompound() + .getCompoundTag(((TravelGear) goggles.getItem()).getBaseTagName()) + .getBoolean("Night Vision")) { + activeGoggles = !activeGoggles; + PlayerAbilityHelper.toggleGoggles(mc.thePlayer, activeGoggles); + toggleGoggles(); + } + } + } + + public static boolean doBeltSwapIfPossible() { + if (ArmorProxyClient.armorExtended.inventory[3] != null) { + PlayerAbilityHelper.swapBelt(mc.thePlayer, ArmorProxyClient.armorExtended); + toggleBelt(); + return true; + } + return false; + } + + public void landOnGround() { + midairJumps = 0; + jumping = false; + } + + public void resetControls() { + midairJumps = 0; + jumping = false; + climbing = false; + onGround = false; + } + + void resetFallDamage() { + AbstractPacket packet = new DoubleJumpPacket(); + updateServer(packet); + } + + public static void openArmorGui() { + AbstractPacket packet = new AccessoryInventoryPacket(ArmorProxyCommon.armorGuiID); + updateServer(packet); + } + + public static void openKnapsackGui() { + AbstractPacket packet = new AccessoryInventoryPacket(ArmorProxyCommon.knapsackGuiID); + updateServer(packet); + } + + private void toggleGoggles() { + AbstractPacket packet = new GogglePacket(activeGoggles); + updateServer(packet); + } + + private static void toggleBelt() { + AbstractPacket packet = new BeltPacket(); + updateServer(packet); + } + + static void updateServer(AbstractPacket abstractPacket) { + TConstruct.packetPipeline.sendToServer(abstractPacket); + } } diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java index e29e2840979..dde29c656d7 100644 --- a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java @@ -9,17 +9,15 @@ import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; -public class BlockSkinRenderHelper -{ - public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) - { +public class BlockSkinRenderHelper { + public static boolean renderMetadataBlock( + Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; float var8 = (float) (var5 & 255) / 255.0F; - if (EntityRenderer.anaglyphEnable) - { + if (EntityRenderer.anaglyphEnable) { float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; @@ -28,11 +26,22 @@ public static boolean renderMetadataBlock (Block block, int metadata, int x, int var8 = var11; } - return Minecraft.isAmbientOcclusionEnabled() && block.getLightValue() == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); + return Minecraft.isAmbientOcclusionEnabled() && block.getLightValue() == 0 + ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } - static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { + static boolean renderMetadataBlockWithAmbientOcclusion( + Block block, + int metadata, + int xPos, + int yPos, + int zPos, + float colorRed, + float colorGreen, + float colorBlue, + RenderBlocks render, + IBlockAccess world) { render.enableAO = true; boolean flag = false; float f3 = 0.0F; @@ -44,12 +53,9 @@ static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadat Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.getBlockIcon(block).getIconName().equals("grass_top")) - { + if (render.getBlockIcon(block).getIconName().equals("grass_top")) { flag1 = false; - } - else if (render.hasOverrideBlockTexture()) - { + } else if (render.hasOverrideBlockTexture()) { flag1 = false; } @@ -60,10 +66,8 @@ else if (render.hasOverrideBlockTexture()) float f7; int i1; - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) - { - if (render.renderMinY <= 0.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { + if (render.renderMinY <= 0.0D) { --yPos; } @@ -80,83 +84,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); - if (!flag4 && !flag2) - { + if (!flag4 && !flag2) { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZNNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } - if (!flag5 && !flag2) - { + if (!flag5 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZNNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } - if (!flag4 && !flag3) - { + if (!flag4 && !flag3) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZPNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } - if (!flag5 && !flag3) - { + if (!flag5 && !flag3) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZPNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.renderMinY <= 0.0D) - { + if (render.renderMinY <= 0.0D) { ++yPos; } i1 = l; - if (render.renderMinY <= 0.0D || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) - { + if (render.renderMinY <= 0.0D + || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; + f3 = (render.aoLightValueScratchXYZNNP + + render.aoLightValueScratchXYNN + + render.aoLightValueScratchYZNP + + f7) + / 4.0F; + f6 = (render.aoLightValueScratchYZNP + + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXYPN) + / 4.0F; + f5 = (f7 + + render.aoLightValueScratchYZNN + + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXYZPNN) + / 4.0F; + f4 = (render.aoLightValueScratchXYNN + + render.aoLightValueScratchXYZNNN + + f7 + + render.aoLightValueScratchYZNN) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; } render.colorRedTopLeft *= f3; @@ -175,10 +197,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) - { - if (render.renderMaxY >= 1.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { + if (render.renderMaxY >= 1.0D) { ++yPos; } @@ -195,74 +215,92 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); - if (!flag4 && !flag2) - { + if (!flag4 && !flag2) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZNPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } - if (!flag4 && !flag3) - { + if (!flag4 && !flag3) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZPPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } - if (!flag5 && !flag2) - { + if (!flag5 && !flag2) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZNPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } - if (!flag5 && !flag3) - { + if (!flag5 && !flag3) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZPPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.renderMaxY >= 1.0D) - { + if (render.renderMaxY >= 1.0D) { --yPos; } i1 = l; - if (render.renderMaxY >= 1.0D || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) - { + if (render.renderMaxY >= 1.0D + || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; + f6 = (render.aoLightValueScratchXYZNPP + + render.aoLightValueScratchXYNP + + render.aoLightValueScratchYZPP + + f7) + / 4.0F; + f3 = (render.aoLightValueScratchYZPP + + f7 + + render.aoLightValueScratchXYZPPP + + render.aoLightValueScratchXYPP) + / 4.0F; + f4 = (f7 + + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPN) + / 4.0F; + f5 = (render.aoLightValueScratchXYNP + + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) + / 4.0F; + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; render.colorRedTopLeft *= f3; render.colorGreenTopLeft *= f3; render.colorBlueTopLeft *= f3; @@ -281,10 +319,8 @@ else if (render.hasOverrideBlockTexture()) IIcon icon; - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) - { - if (render.renderMinZ <= 0.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { + if (render.renderMinZ <= 0.0D) { --zPos; } @@ -301,83 +337,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); - if (!flag2 && !flag4) - { + if (!flag2 && !flag4) { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZNNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } - if (!flag2 && !flag5) - { + if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZNPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } - if (!flag3 && !flag4) - { + if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZPNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } - if (!flag3 && !flag5) - { + if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZPPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.renderMinZ <= 0.0D) - { + if (render.renderMinZ <= 0.0D) { ++zPos; } i1 = l; - if (render.renderMinZ <= 0.0D || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) - { + if (render.renderMinZ <= 0.0D + || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + f3 = (render.aoLightValueScratchXZNN + + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) + / 4.0F; + f4 = (f7 + + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXZPN + + render.aoLightValueScratchXYZPPN) + / 4.0F; + f5 = (render.aoLightValueScratchYZNN + + f7 + + render.aoLightValueScratchXYZPNN + + render.aoLightValueScratchXZPN) + / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + + render.aoLightValueScratchXZNN + + render.aoLightValueScratchYZNN + + f7) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -398,10 +452,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) - { - if (render.renderMaxZ >= 1.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { + if (render.renderMaxZ >= 1.0D) { ++zPos; } @@ -418,83 +470,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); - if (!flag2 && !flag4) - { + if (!flag2 && !flag4) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZNNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } - if (!flag2 && !flag5) - { + if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZNPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } - if (!flag3 && !flag4) - { + if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZPNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } - if (!flag3 && !flag5) - { + if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZPPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.renderMaxZ >= 1.0D) - { + if (render.renderMaxZ >= 1.0D) { --zPos; } i1 = l; - if (render.renderMaxZ >= 1.0D || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) - { + if (render.renderMaxZ >= 1.0D + || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + f3 = (render.aoLightValueScratchXZNP + + render.aoLightValueScratchXYZNPP + + f7 + + render.aoLightValueScratchYZPP) + / 4.0F; + f6 = (f7 + + render.aoLightValueScratchYZPP + + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYZPPP) + / 4.0F; + f5 = (render.aoLightValueScratchYZNP + + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXZPP) + / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + + render.aoLightValueScratchXZNP + + render.aoLightValueScratchYZNP + + f7) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -515,10 +585,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) - { - if (render.renderMinX <= 0.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { + if (render.renderMinX <= 0.0D) { --xPos; } @@ -535,83 +603,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); - if (!flag5 && !flag2) - { + if (!flag5 && !flag2) { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } else { + render.aoLightValueScratchXYZNNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } - if (!flag4 && !flag2) - { + if (!flag4 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } else { + render.aoLightValueScratchXYZNNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } - if (!flag5 && !flag3) - { + if (!flag5 && !flag3) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } else { + render.aoLightValueScratchXYZNPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } - if (!flag4 && !flag3) - { + if (!flag4 && !flag3) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } else { + render.aoLightValueScratchXYZNPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.renderMinX <= 0.0D) - { + if (render.renderMinX <= 0.0D) { ++xPos; } i1 = l; - if (render.renderMinX <= 0.0D || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) - { + if (render.renderMinX <= 0.0D + || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + f6 = (render.aoLightValueScratchXYNN + + render.aoLightValueScratchXYZNNP + + f7 + + render.aoLightValueScratchXZNP) + / 4.0F; + f3 = (f7 + + render.aoLightValueScratchXZNP + + render.aoLightValueScratchXYNP + + render.aoLightValueScratchXYZNPP) + / 4.0F; + f4 = (render.aoLightValueScratchXZNN + + f7 + + render.aoLightValueScratchXYZNPN + + render.aoLightValueScratchXYNP) + / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + + render.aoLightValueScratchXYNN + + render.aoLightValueScratchXZNN + + f7) + / 4.0F; + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -632,10 +718,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) - { - if (render.renderMaxX >= 1.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { + if (render.renderMaxX >= 1.0D) { ++xPos; } @@ -652,83 +736,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); - if (!flag2 && !flag4) - { + if (!flag2 && !flag4) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } else { + render.aoLightValueScratchXYZPNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } - if (!flag2 && !flag5) - { + if (!flag2 && !flag5) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } else { + render.aoLightValueScratchXYZPNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } - if (!flag3 && !flag4) - { + if (!flag3 && !flag4) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } else { + render.aoLightValueScratchXYZPPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } - if (!flag3 && !flag5) - { + if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } else { + render.aoLightValueScratchXYZPPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.renderMaxX >= 1.0D) - { + if (render.renderMaxX >= 1.0D) { --xPos; } i1 = l; - if (render.renderMaxX >= 1.0D || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) - { + if (render.renderMaxX >= 1.0D + || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + f3 = (render.aoLightValueScratchXYPN + + render.aoLightValueScratchXYZPNP + + f7 + + render.aoLightValueScratchXZPP) + / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXZPN + + f7) + / 4.0F; + f5 = (render.aoLightValueScratchXZPN + + f7 + + render.aoLightValueScratchXYZPPN + + render.aoLightValueScratchXYPP) + / 4.0F; + f6 = (f7 + + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPP) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -753,8 +855,17 @@ else if (render.hasOverrideBlockTexture()) return flag; } - static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { + static boolean renderMetadataBlockWithColorMultiplier( + Block block, + int metadata, + int xPos, + int yPos, + int zPos, + float colorRed, + float colorGreen, + float colorBlue, + RenderBlocks render, + IBlockAccess world) { render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; @@ -775,8 +886,7 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata float f17 = f5; float f18 = f6; - if (block != Blocks.grass) - { + if (block != Blocks.grass) { f10 = f3 * colorRed; f11 = f5 * colorRed; f12 = f6 * colorRed; @@ -790,17 +900,21 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) - { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { + tessellator.setBrightness( + render.renderMinY > 0.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) - { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { + tessellator.setBrightness( + render.renderMaxY < 1.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); flag = true; @@ -808,36 +922,44 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata IIcon icon; - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) - { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { + tessellator.setBrightness( + render.renderMinZ > 0.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(2, metadata)); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) - { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { + tessellator.setBrightness( + render.renderMaxZ < 1.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(3, metadata)); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) - { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { + tessellator.setBrightness( + render.renderMinX > 0.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(4, metadata)); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) - { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { + tessellator.setBrightness( + render.renderMaxX < 1.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(5, metadata)); @@ -847,26 +969,40 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata return flag; } - public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) - { + public static boolean renderLiquidBlock( + IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { return renderLiquidBlock(stillIcon, flowingIcon, x, y, z, renderer, world, false); } - public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world, boolean extraBright) - { + public static boolean renderLiquidBlock( + IIcon stillIcon, + IIcon flowingIcon, + int x, + int y, + int z, + RenderBlocks renderer, + IBlockAccess world, + boolean extraBright) { return renderLiquidBlock(stillIcon, flowingIcon, x, y, z, renderer, world, extraBright, 0xffffffff); } - public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world, boolean extraBright, int color) - { + public static boolean renderLiquidBlock( + IIcon stillIcon, + IIcon flowingIcon, + int x, + int y, + int z, + RenderBlocks renderer, + IBlockAccess world, + boolean extraBright, + int color) { Block block = Blocks.stone; float alpha = (float) (color >> 24 & 255) / 255.0F; - float red = (float) (color >> 16 & 255) / 255.0F; + float red = (float) (color >> 16 & 255) / 255.0F; float green = (float) (color >> 8 & 255) / 255.0F; - float blue = (float) (color & 255) / 255.0F; + float blue = (float) (color & 255) / 255.0F; - if (EntityRenderer.anaglyphEnable) - { + if (EntityRenderer.anaglyphEnable) { float var9 = (red * 30.0F + green * 59.0F + blue * 11.0F) / 100.0F; float var10 = (red * 30.0F + green * 70.0F) / 100.0F; float var11 = (red * 30.0F + blue * 70.0F) / 100.0F; @@ -875,18 +1011,15 @@ public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int blue = var11; } - if (extraBright) - { + if (extraBright) { red = Math.max(1.0f, red + 0.5f); green = Math.max(1.0f, green + 0.5f); blue = Math.max(1.0f, blue + 0.5f); } // safety - if (stillIcon == null) - stillIcon = FluidRegistry.WATER.getStillIcon(); - if (flowingIcon == null) - flowingIcon = FluidRegistry.WATER.getFlowingIcon(); + if (stillIcon == null) stillIcon = FluidRegistry.WATER.getStillIcon(); + if (flowingIcon == null) flowingIcon = FluidRegistry.WATER.getFlowingIcon(); boolean raf = renderer.renderAllFaces; renderer.renderAllFaces = true; @@ -896,9 +1029,11 @@ public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int boolean ret; if (Minecraft.isAmbientOcclusionEnabled()) - ret = renderFakeBlockWithAmbientOcclusion(stillIcon, flowingIcon, x, y, z, red, green, blue, renderer, world); + ret = renderFakeBlockWithAmbientOcclusion( + stillIcon, flowingIcon, x, y, z, red, green, blue, renderer, world); else - ret = renderFakeBlockWithColorMultiplier(stillIcon, flowingIcon, x, y, z, red, green, blue, renderer, world); + ret = renderFakeBlockWithColorMultiplier( + stillIcon, flowingIcon, x, y, z, red, green, blue, renderer, world); GL11.glPopAttrib(); @@ -906,8 +1041,17 @@ public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int return ret; } - static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { + static boolean renderFakeBlockWithAmbientOcclusion( + IIcon stillIcon, + IIcon flowingIcon, + int xPos, + int yPos, + int zPos, + float colorRed, + float colorGreen, + float colorBlue, + RenderBlocks render, + IBlockAccess world) { Block block = Blocks.stone; render.enableAO = true; boolean flag = false; @@ -920,12 +1064,9 @@ static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowi Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.getBlockIcon(block).getIconName().equals("grass_top")) - { + if (render.getBlockIcon(block).getIconName().equals("grass_top")) { flag1 = false; - } - else if (render.hasOverrideBlockTexture()) - { + } else if (render.hasOverrideBlockTexture()) { flag1 = false; } @@ -936,10 +1077,8 @@ else if (render.hasOverrideBlockTexture()) float f7; int i1; - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) - { - if (render.renderMinY <= 0.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { + if (render.renderMinY <= 0.0D) { --yPos; } @@ -956,83 +1095,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); - if (!flag4 && !flag2) - { + if (!flag4 && !flag2) { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZNNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } - if (!flag5 && !flag2) - { + if (!flag5 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; - } - else - { - render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZNNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } - if (!flag4 && !flag3) - { + if (!flag4 && !flag3) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZPNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } - if (!flag5 && !flag3) - { + if (!flag5 && !flag3) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZPNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.renderMinY <= 0.0D) - { + if (render.renderMinY <= 0.0D) { ++yPos; } i1 = l; - if (render.renderMinY <= 0.0D || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) - { + if (render.renderMinY <= 0.0D + || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; + f3 = (render.aoLightValueScratchXYZNNP + + render.aoLightValueScratchXYNN + + render.aoLightValueScratchYZNP + + f7) + / 4.0F; + f6 = (render.aoLightValueScratchYZNP + + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXYPN) + / 4.0F; + f5 = (f7 + + render.aoLightValueScratchYZNN + + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXYZPNN) + / 4.0F; + f4 = (render.aoLightValueScratchXYNN + + render.aoLightValueScratchXYZNNN + + f7 + + render.aoLightValueScratchYZNN) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; } render.colorRedTopLeft *= f3; @@ -1051,10 +1208,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) - { - if (render.renderMaxY >= 1.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { + if (render.renderMaxY >= 1.0D) { ++yPos; } @@ -1071,74 +1226,92 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); - if (!flag4 && !flag2) - { + if (!flag4 && !flag2) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZNPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } - if (!flag4 && !flag3) - { + if (!flag4 && !flag3) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); + } else { + render.aoLightValueScratchXYZPPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } - if (!flag5 && !flag2) - { + if (!flag5 && !flag2) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZNPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } - if (!flag5 && !flag3) - { + if (!flag5 && !flag3) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); + } else { + render.aoLightValueScratchXYZPPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.renderMaxY >= 1.0D) - { + if (render.renderMaxY >= 1.0D) { --yPos; } i1 = l; - if (render.renderMaxY >= 1.0D || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) - { + if (render.renderMaxY >= 1.0D + || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; + f6 = (render.aoLightValueScratchXYZNPP + + render.aoLightValueScratchXYNP + + render.aoLightValueScratchYZPP + + f7) + / 4.0F; + f3 = (render.aoLightValueScratchYZPP + + f7 + + render.aoLightValueScratchXYZPPP + + render.aoLightValueScratchXYPP) + / 4.0F; + f4 = (f7 + + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPN) + / 4.0F; + f5 = (render.aoLightValueScratchXYNP + + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) + / 4.0F; + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; render.colorRedTopLeft *= f3; render.colorGreenTopLeft *= f3; render.colorBlueTopLeft *= f3; @@ -1155,10 +1328,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) - { - if (render.renderMinZ <= 0.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { + if (render.renderMinZ <= 0.0D) { --zPos; } @@ -1175,83 +1346,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); - if (!flag2 && !flag4) - { + if (!flag2 && !flag4) { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZNNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } - if (!flag2 && !flag5) - { + if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZNPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } - if (!flag3 && !flag4) - { + if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZPNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } - if (!flag3 && !flag5) - { + if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZPPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.renderMinZ <= 0.0D) - { + if (render.renderMinZ <= 0.0D) { ++zPos; } i1 = l; - if (render.renderMinZ <= 0.0D || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) - { + if (render.renderMinZ <= 0.0D + || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + f3 = (render.aoLightValueScratchXZNN + + render.aoLightValueScratchXYZNPN + + f7 + + render.aoLightValueScratchYZPN) + / 4.0F; + f4 = (f7 + + render.aoLightValueScratchYZPN + + render.aoLightValueScratchXZPN + + render.aoLightValueScratchXYZPPN) + / 4.0F; + f5 = (render.aoLightValueScratchYZNN + + f7 + + render.aoLightValueScratchXYZPNN + + render.aoLightValueScratchXZPN) + / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + + render.aoLightValueScratchXZNN + + render.aoLightValueScratchYZNN + + f7) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -1271,10 +1460,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) - { - if (render.renderMaxZ >= 1.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { + if (render.renderMaxZ >= 1.0D) { ++zPos; } @@ -1291,83 +1478,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); - if (!flag2 && !flag4) - { + if (!flag2 && !flag4) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZNNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } - if (!flag2 && !flag5) - { + if (!flag2 && !flag5) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZNPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } - if (!flag3 && !flag4) - { + if (!flag3 && !flag4) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); + } else { + render.aoLightValueScratchXYZPNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } - if (!flag3 && !flag5) - { + if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); + } else { + render.aoLightValueScratchXYZPPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.renderMaxZ >= 1.0D) - { + if (render.renderMaxZ >= 1.0D) { --zPos; } i1 = l; - if (render.renderMaxZ >= 1.0D || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) - { + if (render.renderMaxZ >= 1.0D + || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; + f3 = (render.aoLightValueScratchXZNP + + render.aoLightValueScratchXYZNPP + + f7 + + render.aoLightValueScratchYZPP) + / 4.0F; + f6 = (f7 + + render.aoLightValueScratchYZPP + + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYZPPP) + / 4.0F; + f5 = (render.aoLightValueScratchYZNP + + f7 + + render.aoLightValueScratchXYZPNP + + render.aoLightValueScratchXZPP) + / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + + render.aoLightValueScratchXZNP + + render.aoLightValueScratchYZNP + + f7) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } render.colorRedTopLeft *= f3; @@ -1387,10 +1592,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) - { - if (render.renderMinX <= 0.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { + if (render.renderMinX <= 0.0D) { --xPos; } @@ -1407,83 +1610,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); - if (!flag5 && !flag2) - { + if (!flag5 && !flag2) { render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } else { + render.aoLightValueScratchXYZNNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } - if (!flag4 && !flag2) - { + if (!flag4 && !flag2) { render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } else { + render.aoLightValueScratchXYZNNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } - if (!flag5 && !flag3) - { + if (!flag5 && !flag3) { render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } else { + render.aoLightValueScratchXYZNPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } - if (!flag4 && !flag3) - { + if (!flag4 && !flag3) { render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } else { + render.aoLightValueScratchXYZNPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.renderMinX <= 0.0D) - { + if (render.renderMinX <= 0.0D) { ++xPos; } i1 = l; - if (render.renderMinX <= 0.0D || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) - { + if (render.renderMinX <= 0.0D + || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + f6 = (render.aoLightValueScratchXYNN + + render.aoLightValueScratchXYZNNP + + f7 + + render.aoLightValueScratchXZNP) + / 4.0F; + f3 = (f7 + + render.aoLightValueScratchXZNP + + render.aoLightValueScratchXYNP + + render.aoLightValueScratchXYZNPP) + / 4.0F; + f4 = (render.aoLightValueScratchXZNN + + f7 + + render.aoLightValueScratchXYZNPN + + render.aoLightValueScratchXYNP) + / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + + render.aoLightValueScratchXYNN + + render.aoLightValueScratchXZNN + + f7) + / 4.0F; + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -1503,10 +1724,8 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) - { - if (render.renderMaxX >= 1.0D) - { + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { + if (render.renderMaxX >= 1.0D) { ++xPos; } @@ -1523,83 +1742,101 @@ else if (render.hasOverrideBlockTexture()) flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); - if (!flag2 && !flag4) - { + if (!flag2 && !flag4) { render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); + } else { + render.aoLightValueScratchXYZPNN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } - if (!flag2 && !flag5) - { + if (!flag2 && !flag5) { render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); + } else { + render.aoLightValueScratchXYZPNP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } - if (!flag3 && !flag4) - { + if (!flag3 && !flag4) { render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); + } else { + render.aoLightValueScratchXYZPPN = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } - if (!flag3 && !flag5) - { + if (!flag3 && !flag5) { render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); + } else { + render.aoLightValueScratchXYZPPP = + getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = + block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.renderMaxX >= 1.0D) - { + if (render.renderMaxX >= 1.0D) { --xPos; } i1 = l; - if (render.renderMaxX >= 1.0D || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) - { + if (render.renderMaxX >= 1.0D + || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); - - if (flag1) - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; - } - else - { - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; + f3 = (render.aoLightValueScratchXYPN + + render.aoLightValueScratchXYZPNP + + f7 + + render.aoLightValueScratchXZPP) + / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + + render.aoLightValueScratchXYPN + + render.aoLightValueScratchXZPN + + f7) + / 4.0F; + f5 = (render.aoLightValueScratchXZPN + + f7 + + render.aoLightValueScratchXYZPPN + + render.aoLightValueScratchXYPP) + / 4.0F; + f6 = (f7 + + render.aoLightValueScratchXZPP + + render.aoLightValueScratchXYPP + + render.aoLightValueScratchXYZPPP) + / 4.0F; + render.brightnessTopLeft = render.getAoBrightness( + render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness( + render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness( + render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); + render.brightnessBottomLeft = render.getAoBrightness( + render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + + if (flag1) { + render.colorRedTopLeft = render.colorRedBottomLeft = + render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = + render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = + render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; + } else { + render.colorRedTopLeft = + render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = + render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = + render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } render.colorRedTopLeft *= f3; @@ -1623,8 +1860,17 @@ else if (render.hasOverrideBlockTexture()) return flag; } - static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { + static boolean renderFakeBlockWithColorMultiplier( + IIcon stillIcon, + IIcon flowingIcon, + int xPos, + int yPos, + int zPos, + float colorRed, + float colorGreen, + float colorBlue, + RenderBlocks render, + IBlockAccess world) { Block block = Blocks.stone; render.enableAO = false; Tessellator tessellator = Tessellator.instance; @@ -1646,8 +1892,7 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowin float f17 = f5; float f18 = f6; - if (block != Blocks.grass) - { + if (block != Blocks.grass) { f10 = f3 * colorRed; f11 = f5 * colorRed; f12 = f6 * colorRed; @@ -1661,17 +1906,21 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowin int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) - { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { + tessellator.setBrightness( + render.renderMinY > 0.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) - { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { + tessellator.setBrightness( + render.renderMaxY < 1.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; @@ -1679,36 +1928,44 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowin IIcon icon; - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) - { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { + tessellator.setBrightness( + render.renderMinZ > 0.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) - { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { + tessellator.setBrightness( + render.renderMaxZ < 1.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) - { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { + tessellator.setBrightness( + render.renderMinX > 0.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) - { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { + tessellator.setBrightness( + render.renderMaxX < 1.0D + ? l + : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); @@ -1718,8 +1975,7 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowin return flag; } - public static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z) - { + public static float getAmbientOcclusionLightValue(IBlockAccess access, int x, int y, int z) { return access.getBlock(x, y, z).getAmbientOcclusionLightValue(); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/client/BreakingFX.java b/src/main/java/tconstruct/client/BreakingFX.java index 8f939dccdfe..275d7e71f23 100644 --- a/src/main/java/tconstruct/client/BreakingFX.java +++ b/src/main/java/tconstruct/client/BreakingFX.java @@ -8,15 +8,12 @@ import net.minecraft.world.World; @SideOnly(Side.CLIENT) -public class BreakingFX extends EntityFX -{ - public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item) - { +public class BreakingFX extends EntityFX { + public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item) { this(par1World, par2, par4, par6, par8Item, 0); } - public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item, int par9) - { + public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item, int par9) { super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D); this.setParticleIcon(par8Item.getIconFromDamage(par9)); this.particleRed = this.particleGreen = this.particleBlue = 1.0F; @@ -24,8 +21,16 @@ public BreakingFX(World par1World, double par2, double par4, double par6, Item p this.particleScale /= 2.0F; } - public BreakingFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, Item par14Item, int par15) - { + public BreakingFX( + World par1World, + double par2, + double par4, + double par6, + double par8, + double par10, + double par12, + Item par14Item, + int par15) { this(par1World, par2, par4, par6, par14Item, par15); this.motionX *= 0.10000000149011612D; this.motionY *= 0.10000000149011612D; @@ -36,22 +41,20 @@ public BreakingFX(World par1World, double par2, double par4, double par6, double } @Override - public int getFXLayer () - { + public int getFXLayer() { return 2; } @Override - public void renderParticle (Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) - { + public void renderParticle( + Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { float f6 = ((float) this.particleTextureIndexX + this.particleTextureJitterX / 4.0F) / 16.0F; float f7 = f6 + 0.015609375F; float f8 = ((float) this.particleTextureIndexY + this.particleTextureJitterY / 4.0F) / 16.0F; float f9 = f8 + 0.015609375F; float f10 = 0.1F * this.particleScale; - if (this.particleIcon != null) - { + if (this.particleIcon != null) { f6 = this.particleIcon.getInterpolatedU((double) (this.particleTextureJitterX / 4.0F * 16.0F)); f7 = this.particleIcon.getInterpolatedU((double) ((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F)); f8 = this.particleIcon.getInterpolatedV((double) (this.particleTextureJitterY / 4.0F * 16.0F)); @@ -63,9 +66,29 @@ public void renderParticle (Tessellator par1Tessellator, float par2, float par3, float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ); float f14 = 1.0F; par1Tessellator.setColorOpaque_F(f14 * this.particleRed, f14 * this.particleGreen, f14 * this.particleBlue); - par1Tessellator.addVertexWithUV((double) (f11 - par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 - par5 * f10 - par7 * f10), (double) f6, (double) f9); - par1Tessellator.addVertexWithUV((double) (f11 - par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 - par5 * f10 + par7 * f10), (double) f6, (double) f8); - par1Tessellator.addVertexWithUV((double) (f11 + par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 + par5 * f10 + par7 * f10), (double) f7, (double) f8); - par1Tessellator.addVertexWithUV((double) (f11 + par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 + par5 * f10 - par7 * f10), (double) f7, (double) f9); + par1Tessellator.addVertexWithUV( + (double) (f11 - par3 * f10 - par6 * f10), + (double) (f12 - par4 * f10), + (double) (f13 - par5 * f10 - par7 * f10), + (double) f6, + (double) f9); + par1Tessellator.addVertexWithUV( + (double) (f11 - par3 * f10 + par6 * f10), + (double) (f12 + par4 * f10), + (double) (f13 - par5 * f10 + par7 * f10), + (double) f6, + (double) f8); + par1Tessellator.addVertexWithUV( + (double) (f11 + par3 * f10 + par6 * f10), + (double) (f12 + par4 * f10), + (double) (f13 + par5 * f10 + par7 * f10), + (double) f7, + (double) f8); + par1Tessellator.addVertexWithUV( + (double) (f11 + par3 * f10 - par6 * f10), + (double) (f12 - par4 * f10), + (double) (f13 + par5 * f10 - par7 * f10), + (double) f7, + (double) f9); } } diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java index 9656c16fa3b..4d990900397 100644 --- a/src/main/java/tconstruct/client/CustomBowRenderer.java +++ b/src/main/java/tconstruct/client/CustomBowRenderer.java @@ -11,64 +11,52 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.*; -public class CustomBowRenderer implements IItemRenderer -{ +public class CustomBowRenderer implements IItemRenderer { Minecraft mc = Minecraft.getMinecraft(); private RenderBlocks renderBlocksInstance = new RenderBlocks(); @Override - public boolean handleRenderType (ItemStack item, ItemRenderType type) - { + public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON; } @Override - public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { return true; } @Override - public void renderItem (ItemRenderType type, ItemStack item, Object... data) - { + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { EntityLivingBase living = (EntityLivingBase) data[1]; ItemRenderer renderer = RenderManager.instance.itemRenderer; for (int i = 0; i < item.getItem().getRenderPasses(item.getItemDamage()) + 1; i++) renderItem(living, item, i, type); } - public void renderItem (EntityLivingBase living, ItemStack stack, int renderPass, ItemRenderType type) - { + public void renderItem(EntityLivingBase living, ItemStack stack, int renderPass, ItemRenderType type) { GL11.glPushMatrix(); IIcon icon = null; - if (living instanceof EntityPlayer) - { + if (living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; if (player.getItemInUse() != null) - icon = stack.getItem().getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount()); - else - icon = living.getItemIcon(stack, renderPass); - } - else - { + icon = stack.getItem() + .getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount()); + else icon = living.getItemIcon(stack, renderPass); + } else { icon = living.getItemIcon(stack, renderPass); } - if (icon == null) - { + if (icon == null) { GL11.glPopMatrix(); return; } TextureManager texturemanager = this.mc.getTextureManager(); texturemanager.bindTexture(texturemanager.getResourceLocation(stack.getItemSpriteNumber())); - if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) - { + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { GL11.glTranslatef(0.6F, 0.5F, 0.5F); - } - else - { + } else { GL11.glRotatef(180.0F, 0F, 0F, 1.0F); GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.75F); GL11.glTranslatef(-0.6F, -0.25F, 1.0F); @@ -95,5 +83,4 @@ public void renderItem (EntityLivingBase living, ItemStack stack, int renderPass GL11.glPopMatrix(); } - } diff --git a/src/main/java/tconstruct/client/CustomFont.java b/src/main/java/tconstruct/client/CustomFont.java index 90a67d0fd13..1dad2859c59 100644 --- a/src/main/java/tconstruct/client/CustomFont.java +++ b/src/main/java/tconstruct/client/CustomFont.java @@ -10,14 +10,13 @@ import org.lwjgl.opengl.GL11; /** - * + * * @author TheObliterator - * + * * A class to create and draw true type fonts onto the Minecraft game * engine. */ -public class CustomFont -{ +public class CustomFont { private int texID; private int[] xPos; private int[] yPos; @@ -28,9 +27,9 @@ public class CustomFont /** * Instantiates the font, filling in default start and end character * parameters. - * + * * 'new CustomFont(ModLoader.getMinecraftInstance(), "Arial", 12); - * + * * @param mc * The Minecraft instance for the font to be bound to. * @param fontName @@ -38,8 +37,7 @@ public class CustomFont * @param size * The size of the font to be drawn. */ - public CustomFont(Minecraft mc, Object font, int size) - { + public CustomFont(Minecraft mc, Object font, int size) { this(mc, font, size, 0, 4000); } @@ -47,9 +45,9 @@ public CustomFont(Minecraft mc, Object font, int size) * Instantiates the font, pre-rendering a sprite font image by using a true * type font on a bitmap. Then allocating that bitmap to the Minecraft * rendering engine for later use. - * + * * 'new CustomFont(ModLoader.getMinecraftInstance(), "Arial", 12, 32, 126);' - * + * * @param mc * The Minecraft instance for the font to be bound to. * @param fontName @@ -61,8 +59,7 @@ public CustomFont(Minecraft mc, Object font, int size) * @param endChar * The ending ASCII character id to be drawable. (Default 126) */ - public CustomFont(Minecraft mc, Object font, int size, int startChar, int endChar) - { + public CustomFont(Minecraft mc, Object font, int size, int startChar, int endChar) { this.startChar = startChar; this.endChar = endChar; xPos = new int[endChar - startChar]; @@ -74,27 +71,20 @@ public CustomFont(Minecraft mc, Object font, int size, int startChar, int endCha // it is not the Minecraft engine will not draw it properly. BufferedImage img = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB); Graphics g = img.getGraphics(); - try - { - if (font instanceof String) - { + try { + if (font instanceof String) { String fontName = (String) font; if (fontName.contains("/")) - g.setFont(Font.createFont(Font.TRUETYPE_FONT, new File(fontName)).deriveFont((float) size)); - else - g.setFont(new Font(fontName, 0, size)); - } - else if (font instanceof InputStream) - { - g.setFont(Font.createFont(Font.TRUETYPE_FONT, (InputStream) font).deriveFont((float) size)); - } - else if (font instanceof File) - { + g.setFont(Font.createFont(Font.TRUETYPE_FONT, new File(fontName)) + .deriveFont((float) size)); + else g.setFont(new Font(fontName, 0, size)); + } else if (font instanceof InputStream) { + g.setFont( + Font.createFont(Font.TRUETYPE_FONT, (InputStream) font).deriveFont((float) size)); + } else if (font instanceof File) { g.setFont(Font.createFont(Font.TRUETYPE_FONT, (File) font).deriveFont((float) size)); } - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } @@ -110,14 +100,12 @@ else if (font instanceof File) // later when drawing. int x = 2; int y = 2; - for (int i = startChar; i < endChar; i++) - { + for (int i = startChar; i < endChar; i++) { g.drawString("" + ((char) i), x, y + g.getFontMetrics().getAscent()); xPos[i - startChar] = x; yPos[i - startChar] = y - metrics.getMaxDescent(); x += metrics.stringWidth("" + (char) i) + 2; - if (x >= 250 - metrics.getMaxAdvance()) - { + if (x >= 250 - metrics.getMaxAdvance()) { x = 2; y += metrics.getMaxAscent() + metrics.getMaxDescent() + size / 2; } @@ -131,7 +119,7 @@ else if (font instanceof File) /** * Draws a given string with an automatically calculated shadow below it. - * + * * @param gui * The gui/subclass to be drawn on * @param text @@ -143,8 +131,7 @@ else if (font instanceof File) * @param color * The color of the non-shadowed text (Hex) */ - public void drawStringS (Gui gui, String text, int x, int y, int color) - { + public void drawStringS(Gui gui, String text, int x, int y, int color) { int l = color & 0xff000000; int shade = (color & 0xfcfcfc) >> 2; shade += l; @@ -154,7 +141,7 @@ public void drawStringS (Gui gui, String text, int x, int y, int color) /** * Draws a given string onto a gui/subclass. - * + * * @param gui * The gui/subclass to be drawn on * @param text @@ -166,8 +153,7 @@ public void drawStringS (Gui gui, String text, int x, int y, int color) * @param color * The color of the non-shadowed text (Hex) */ - public void drawString (Gui gui, String text, int x, int y, int color) - { + public void drawString(Gui gui, String text, int x, int y, int color) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glEnable(3553 /* GL_TEXTURE_2D */); GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, texID); @@ -177,14 +163,11 @@ public void drawString (Gui gui, String text, int x, int y, int color) float alpha = (float) (color >> 24 & 0xff) / 255F; GL11.glColor4f(red, green, blue, alpha); int startX = x; - for (int i = 0; i < text.length(); i++) - { + for (int i = 0; i < text.length(); i++) { char c = text.charAt(i); - if (c == '\\') - { + if (c == '\\') { char type = text.charAt(i + 1); - if (type == 'n') - { + if (type == 'n') { y += metrics.getAscent() + 2; x = startX; } @@ -199,64 +182,56 @@ public void drawString (Gui gui, String text, int x, int y, int color) /** * Returns the created FontMetrics which is used to retrive various * information about the True Type Font - * + * * @return FontMetrics of the created font. */ - public FontMetrics getMetrics () - { + public FontMetrics getMetrics() { return metrics; } /** * Gets the drawing width of a given string of string. - * + * * @param text * The string to be measured * @return The width of the given string. */ - public int getStringWidth (String text) - { + public int getStringWidth(String text) { return (int) getBounds(text).getWidth(); } /** * Gets the drawing height of a given string of string. - * + * * @param text * The string to be measured * @return The height of the given string. */ - public int getStringHeight (String text) - { + public int getStringHeight(String text) { return (int) getBounds(text).getHeight(); } /** * A method that returns a Rectangle that contains the width and height * demensions of the given string. - * + * * @param text * The string to be measured * @return Rectangle containing width and height that the text will consume * when drawn. */ - private Rectangle getBounds (String text) - { + private Rectangle getBounds(String text) { int w = 0; int h = 0; int tw = 0; - for (int i = 0; i < text.length(); i++) - { + for (int i = 0; i < text.length(); i++) { char c = text.charAt(i); - if (c == '\\') - { + if (c == '\\') { char type = text.charAt(i + 1); - if (type == 'n') - { + if (type == 'n') { h += metrics.getAscent() + 2; - if (tw > w) - w = tw; + if (tw > w) w = tw; tw = 0; } i++; @@ -264,8 +239,7 @@ private Rectangle getBounds (String text) } tw += metrics.stringWidth("" + c); } - if (tw > w) - w = tw; + if (tw > w) w = tw; h += metrics.getAscent(); return new Rectangle(0, 0, w, h); } @@ -273,22 +247,27 @@ private Rectangle getBounds (String text) /** * Private drawing method used within other drawing methods. */ - private void drawChar (Gui gui, char c, int x, int y) - { + private void drawChar(Gui gui, char c, int x, int y) { Rectangle2D bounds = metrics.getStringBounds("" + c, null); - drawTexturedModalRect(x, y, xPos[(byte) c - startChar], yPos[(byte) c - startChar], (int) bounds.getWidth(), (int) bounds.getHeight() + metrics.getMaxDescent()); + drawTexturedModalRect( + x, + y, + xPos[(byte) c - startChar], + yPos[(byte) c - startChar], + (int) bounds.getWidth(), + (int) bounds.getHeight() + metrics.getMaxDescent()); } - public void drawTexturedModalRect (int x, int y, int u, int v, int width, int height) - { + public void drawTexturedModalRect(int x, int y, int u, int v, int width, int height) { float offsetWidth = 0.00390625F; float offsetHeight = 0.00390625F; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV((x + 0), (y + height), 0, ((u + 0) * offsetWidth), ((v + height) * offsetHeight)); - tessellator.addVertexWithUV((x + width), (y + height), 0, ((u + width) * offsetWidth), ((v + height) * offsetHeight)); + tessellator.addVertexWithUV( + (x + width), (y + height), 0, ((u + width) * offsetWidth), ((v + height) * offsetHeight)); tessellator.addVertexWithUV((x + width), (y + 0), 0, ((u + width) * offsetWidth), ((v + 0) * offsetHeight)); tessellator.addVertexWithUV((x + 0), (y + 0), 0, ((u + 0) * offsetWidth), ((v + 0) * offsetHeight)); tessellator.draw(); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/client/FlexibleToolRenderer.java b/src/main/java/tconstruct/client/FlexibleToolRenderer.java index 6b44728ae87..f22a9872a52 100644 --- a/src/main/java/tconstruct/client/FlexibleToolRenderer.java +++ b/src/main/java/tconstruct/client/FlexibleToolRenderer.java @@ -12,23 +12,22 @@ import tconstruct.library.tools.ToolCore; public class FlexibleToolRenderer implements IItemRenderer { - public float depth = 1/32f; + public float depth = 1 / 32f; - public void setDepth(float d) { depth = d; } + public void setDepth(float d) { + depth = d; + } @Override - public boolean handleRenderType (ItemStack item, ItemRenderType type) - { - if(!item.hasTagCompound()) - return false; + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + if (!item.hasTagCompound()) return false; - switch (type) - { + switch (type) { case ENTITY: - //GL11.glTranslatef(-0.0625F, -0.0625F, 0F); + // GL11.glTranslatef(-0.0625F, -0.0625F, 0F); return true; case EQUIPPED: - //GL11.glTranslatef(0.03f, 0F, -0.09375F); + // GL11.glTranslatef(0.03f, 0F, -0.09375F); case EQUIPPED_FIRST_PERSON: return true; case INVENTORY: @@ -41,8 +40,7 @@ public boolean handleRenderType (ItemStack item, ItemRenderType type) } @Override - public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { return handleRenderType(item, type) & helper.ordinal() < ItemRendererHelper.EQUIPPED_BLOCK.ordinal(); } @@ -51,13 +49,11 @@ public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemR protected void specialAnimation(ItemRenderType type, ItemStack item) {} @Override - public void renderItem (ItemRenderType type, ItemStack item, Object... data) { - if(item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore)) - return; + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore)) return; Entity ent = null; - if (data.length > 1) - ent = (Entity) data[1]; + if (data.length > 1) ent = (Entity) data[1]; IIcon[] parts = new IIcon[toolIcons]; int iconParts = getIcons(item, type, ent, parts); @@ -80,8 +76,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { float[] yDiff = new float[iconParts]; float[] xSub = new float[iconParts]; float[] ySub = new float[iconParts]; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { IIcon icon = parts[i]; xMin[i] = icon.getMinU(); xMax[i] = icon.getMaxU(); @@ -98,22 +93,18 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - if(type != ItemRenderType.ENTITY) { + if (type != ItemRenderType.ENTITY) { specialAnimation(type, item); - } - else - GL11.glTranslatef(-0.5f, -0.25f, 0); // why? because.. minecraft. + } else GL11.glTranslatef(-0.5f, -0.25f, 0); // why? because.. minecraft. // prepare colors int[] color = new int[iconParts]; - for(int i = 0; i < iconParts; i++) - color[i] = item.getItem().getColorFromItemStack(item, i); + for (int i = 0; i < iconParts; i++) color[i] = item.getItem().getColorFromItemStack(item, i); // one side tess.startDrawingQuads(); tess.setNormal(0, 0, 1); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); tess.addVertexWithUV(0, 0, +depth, xMax[i], yMax[i]); tess.addVertexWithUV(1, 0, +depth, xMin[i], yMax[i]); @@ -125,8 +116,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { // other side tess.startDrawingQuads(); tess.setNormal(0, 0, -1); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); tess.addVertexWithUV(0, 1, -depth, xMax[i], yMin[i]); tess.addVertexWithUV(1, 1, -depth, xMin[i], yMin[i]); @@ -141,12 +131,10 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { float pos; float iconPos; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; - for (int k = 0, e = (int)w; k < e; ++k) - { + for (int k = 0, e = (int) w; k < e; ++k) { pos = k / w; iconPos = m + d * pos - s; tess.addVertexWithUV(pos, 0, -depth, iconPos, yMax[i]); @@ -161,13 +149,11 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { tess.setNormal(1, 0, 0); float posEnd; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; float d2 = 1f / w; - for (int k = 0, e = (int)w; k < e; ++k) - { + for (int k = 0, e = (int) w; k < e; ++k) { pos = k / w; iconPos = m + d * pos - s; posEnd = pos + d2; @@ -182,13 +168,11 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { tess.startDrawingQuads(); tess.setNormal(0, 1, 0); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; float d2 = 1f / h; - for (int k = 0, e = (int)h; k < e; ++k) - { + for (int k = 0, e = (int) h; k < e; ++k) { pos = k / h; iconPos = m + d * pos - s; posEnd = pos + d2; @@ -203,12 +187,10 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { tess.startDrawingQuads(); tess.setNormal(0, -1, 0); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; - for (int k = 0, e = (int)h; k < e; ++k) - { + for (int k = 0, e = (int) h; k < e; ++k) { pos = k / h; iconPos = m + d * pos - s; tess.addVertexWithUV(1, pos, +depth, xMin[i], iconPos); @@ -223,21 +205,19 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { GL11.glPopMatrix(); } - public void renderInventory(int count, IIcon[] icons, ItemStack item) - { + public void renderInventory(int count, IIcon[] icons, ItemStack item) { Tessellator tess = Tessellator.instance; GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glAlphaFunc(GL11.GL_GREATER, 0.5F); - //GL11.glDisable(GL11.GL_BLEND); + // GL11.glDisable(GL11.GL_BLEND); tess.startDrawingQuads(); // draw a simple rectangle for the inventory icon - for (int i = 0; i < count; ++i) - { + for (int i = 0; i < count; ++i) { tess.setColorOpaque_I(item.getItem().getColorFromItemStack(item, i)); final IIcon icon = icons[i]; @@ -245,23 +225,22 @@ public void renderInventory(int count, IIcon[] icons, ItemStack item) final float xmax = icon.getMaxU(); final float ymin = icon.getMinV(); final float ymax = icon.getMaxV(); - tess.addVertexWithUV( 0, 16, 0, xmin, ymax); + tess.addVertexWithUV(0, 16, 0, xmin, ymax); tess.addVertexWithUV(16, 16, 0, xmax, ymax); - tess.addVertexWithUV(16, 0, 0, xmax, ymin); - tess.addVertexWithUV( 0, 0, 0, xmin, ymin); + tess.addVertexWithUV(16, 0, 0, xmax, ymin); + tess.addVertexWithUV(0, 0, 0, xmin, ymin); } tess.draw(); - //GL11.glEnable(GL11.GL_BLEND); + // GL11.glEnable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - public int getIcons(ItemStack item, ItemRenderType type, Entity ent, IIcon[] parts) - { - int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage()); + public int getIcons(ItemStack item, ItemRenderType type, Entity ent, IIcon[] parts) { + int iconParts = toolIcons; // tool.getRenderPasses(item.getItemDamage()); // TODO: have the tools define how many render passes they have // (requires more logic rewrite than it sounds like) @@ -271,35 +250,28 @@ public int getIcons(ItemStack item, ItemRenderType type, Entity ent, IIcon[] par IIcon[] tempParts = new IIcon[iconParts]; label: { - if (!isInventory && ent instanceof EntityPlayer) - { + if (!isInventory && ent instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) ent; ItemStack itemInUse = player.getItemInUse(); - if (itemInUse != null) - { + if (itemInUse != null) { int useCount = player.getItemInUseCount(); - for (int i = iconParts; i-- > 0;) + for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); break label; } } - for (int i = iconParts; i-- > 0;) - tempParts[i] = tool.getIcon(item, i); + for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i); } int count = 0; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { IIcon part = tempParts[i]; - if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon) - ++count; - else - parts[i - count] = part; + if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon) ++count; + else parts[i - count] = part; } iconParts -= count; - if (iconParts <= 0) - { + if (iconParts <= 0) { iconParts = 1; parts[0] = ToolCore.blankSprite; } diff --git a/src/main/java/tconstruct/client/IconFlipped.java b/src/main/java/tconstruct/client/IconFlipped.java index 64e14e08a43..69e597d469d 100644 --- a/src/main/java/tconstruct/client/IconFlipped.java +++ b/src/main/java/tconstruct/client/IconFlipped.java @@ -15,8 +15,7 @@ public IconFlipped(IIcon p_i1560_1_, boolean p_i1560_2_, boolean p_i1560_3_) { } // has a faulty implementation in original class - public float getMinV() - { + public float getMinV() { return this.flipV ? this.baseIcon.getMaxV() : this.baseIcon.getMinV(); } } diff --git a/src/main/java/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java index fb9d28d21bb..9f972c32fe0 100644 --- a/src/main/java/tconstruct/client/StepSoundSlime.java +++ b/src/main/java/tconstruct/client/StepSoundSlime.java @@ -2,11 +2,9 @@ import net.minecraft.block.Block.SoundType; -public class StepSoundSlime extends SoundType -{ +public class StepSoundSlime extends SoundType { - public StepSoundSlime(String par1Str, float par2, float par3) - { + public StepSoundSlime(String par1Str, float par2, float par3) { super(par1Str, par2, par3); // TODO Auto-generated constructor stub } @@ -15,8 +13,7 @@ public StepSoundSlime(String par1Str, float par2, float par3) * Used when a block breaks, EXA: Player break, Shep eating grass, etc.. */ @Override - public String getBreakSound () - { + public String getBreakSound() { return this.soundName + ".big"; } @@ -24,9 +21,7 @@ public String getBreakSound () * Used when a entity walks over, or otherwise interacts with the block. */ @Override - public String getStepResourcePath () - { + public String getStepResourcePath() { return this.soundName + ".small"; } - } diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 93f1fc1a03c..c1b2da5b23d 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -3,7 +3,6 @@ import java.io.InputStream; import java.text.DecimalFormat; import javax.xml.parsers.*; - import mantle.client.SmallFontRenderer; import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.Minecraft; @@ -35,7 +34,8 @@ public void initialize() { /* Registers any rendering code. */ public void registerRenderer() { Minecraft mc = Minecraft.getMinecraft(); - smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); + smallFontRenderer = new SmallFontRenderer( + mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); } public static Document diary; @@ -47,7 +47,10 @@ public void registerRenderer() { public void readManuals() { DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); + String CurrentLanguage = Minecraft.getMinecraft() + .getLanguageManager() + .getCurrentLanguage() + .getLanguageCode(); Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/diary.xml", dbFactory); Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory); @@ -59,7 +62,8 @@ public void readManuals() { volume1 = volume1_cl != null ? volume1_cl : readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory); volume2 = volume2_cl != null ? volume2_cl : readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory); smelter = smelter_cl != null ? smelter_cl : readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory); - weaponry = weaponry_cl != null ? weaponry_cl : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory); + weaponry = + weaponry_cl != null ? weaponry_cl : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory); initManualIcons(); initManualRecipes(); @@ -96,12 +100,9 @@ public void initManualIcons() { MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Blocks.netherrack)); } - public void initManualRecipes() { - } + public void initManualRecipes() {} - void initManualPages() { - - } + void initManualPages() {} public static Document getManualFromStack(ItemStack stack) { switch (stack.getItemDamage()) { @@ -121,5 +122,4 @@ public static Document getManualFromStack(ItemStack stack) { public void recalculateHealth() { ArmorProxyClient.armorExtended.recalculateHealth(mc.thePlayer, TPlayerStats.get(mc.thePlayer)); } - } diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index 1683b7fb0e7..df96861b377 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -1,10 +1,6 @@ package tconstruct.client; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -14,105 +10,88 @@ import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; -public class ToolCoreRenderer implements IItemRenderer -{ +public class ToolCoreRenderer implements IItemRenderer { private final boolean isEntity; private final boolean noEntityTranslation; - public ToolCoreRenderer() - { + public ToolCoreRenderer() { this(false, false); } - public ToolCoreRenderer(boolean isEntity) - { + public ToolCoreRenderer(boolean isEntity) { this(isEntity, false); } - public ToolCoreRenderer(boolean isEntity, boolean noEntityTranslation) - { + public ToolCoreRenderer(boolean isEntity, boolean noEntityTranslation) { this.isEntity = isEntity; this.noEntityTranslation = noEntityTranslation; } @Override - public boolean handleRenderType (ItemStack item, ItemRenderType type) - { - if (!item.hasTagCompound()) - return false; + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + if (!item.hasTagCompound()) return false; - switch (type) - { - case ENTITY: - return true; - case EQUIPPED: - GL11.glTranslatef(0.03f, 0F, -0.09375F); - case EQUIPPED_FIRST_PERSON: - return !isEntity; - case INVENTORY: - return true; - default: - TConstruct.logger.warn("[TCon] Unhandled render case!"); - case FIRST_PERSON_MAP: - return false; + switch (type) { + case ENTITY: + return true; + case EQUIPPED: + GL11.glTranslatef(0.03f, 0F, -0.09375F); + case EQUIPPED_FIRST_PERSON: + return !isEntity; + case INVENTORY: + return true; + default: + TConstruct.logger.warn("[TCon] Unhandled render case!"); + case FIRST_PERSON_MAP: + return false; } } @Override - public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { return handleRenderType(item, type) & helper.ordinal() < ItemRendererHelper.EQUIPPED_BLOCK.ordinal(); } private static final int toolIcons = 10; @Override - public void renderItem (ItemRenderType type, ItemStack item, Object... data) - { + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { ToolCore tool = (ToolCore) item.getItem(); boolean isInventory = type == ItemRenderType.INVENTORY; Entity ent = null; - if (data.length > 1) - ent = (Entity) data[1]; + if (data.length > 1) ent = (Entity) data[1]; - int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage()); + int iconParts = toolIcons; // tool.getRenderPasses(item.getItemDamage()); // TODO: have the tools define how many render passes they have // (requires more logic rewrite than it sounds like) IIcon[] tempParts = new IIcon[iconParts]; label: { - if (!isInventory && ent instanceof EntityPlayer) - { + if (!isInventory && ent instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) ent; ItemStack itemInUse = player.getItemInUse(); - if (itemInUse != null) - { + if (itemInUse != null) { int useCount = player.getItemInUseCount(); - for (int i = iconParts; i-- > 0;) + for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount); break label; } } - for (int i = iconParts; i-- > 0;) - tempParts[i] = tool.getIcon(item, i); + for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i); } int count = 0; IIcon[] parts = new IIcon[iconParts]; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { IIcon part = tempParts[i]; - if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon) - ++count; - else - parts[i - count] = part; + if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon) ++count; + else parts[i - count] = part; } iconParts -= count; - if (iconParts <= 0) - { + if (iconParts <= 0) { iconParts = 1; // TODO: assign default sprite // parts = new Icon[]{ defaultSprite }; @@ -131,8 +110,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) float[] yDiff = new float[iconParts]; float[] xSub = new float[iconParts]; float[] ySub = new float[iconParts]; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { IIcon icon = parts[i]; xMin[i] = icon.getMinU(); xMax[i] = icon.getMaxU(); @@ -149,26 +127,22 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) // color int[] color = new int[iconParts]; - for(int i = 0; i < iconParts; i++) - color[i] = item.getItem().getColorFromItemStack(item, i); - + for (int i = 0; i < iconParts; i++) color[i] = item.getItem().getColorFromItemStack(item, i); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - if (type == ItemRenderType.INVENTORY) - { + if (type == ItemRenderType.INVENTORY) { - //TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - //texturemanager.getResourceLocation(item.getItemSpriteNumber()); - //TextureUtil.func_152777_a(false, false, 1.0F); + // TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); + // texturemanager.getResourceLocation(item.getItemSpriteNumber()); + // TextureUtil.func_152777_a(false, false, 1.0F); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_BLEND); tess.startDrawingQuads(); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); tess.addVertexWithUV(0, 16, 0, xMin[i], yMax[i]); tess.addVertexWithUV(16, 16, 0, xMax[i], yMax[i]); @@ -180,31 +154,28 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_BLEND); - //GL11.glDisable(GL12.GL_RESCALE_NORMAL); - //texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); - //TextureUtil.func_147945_b(); - } - else - { - switch (type) - { - case EQUIPPED_FIRST_PERSON: - break; - case EQUIPPED: - GL11.glTranslatef(0, -4 / 16f, 0); - break; - case ENTITY: - if (!noEntityTranslation) - GL11.glTranslatef(-0.5f, 0f, depth); // correction of the rotation point when items lie on the ground - break; - default: + // GL11.glDisable(GL12.GL_RESCALE_NORMAL); + // texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); + // TextureUtil.func_147945_b(); + } else { + switch (type) { + case EQUIPPED_FIRST_PERSON: + break; + case EQUIPPED: + GL11.glTranslatef(0, -4 / 16f, 0); + break; + case ENTITY: + if (!noEntityTranslation) + GL11.glTranslatef( + -0.5f, 0f, depth); // correction of the rotation point when items lie on the ground + break; + default: } // one side tess.startDrawingQuads(); tess.setNormal(0, 0, 1); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); tess.addVertexWithUV(0, 0, 0, xMax[i], yMax[i]); tess.addVertexWithUV(1, 0, 0, xMin[i], yMax[i]); @@ -216,8 +187,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) // other side tess.startDrawingQuads(); tess.setNormal(0, 0, -1); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); tess.addVertexWithUV(0, 1, -depth, xMax[i], yMin[i]); tess.addVertexWithUV(1, 1, -depth, xMin[i], yMin[i]); @@ -232,12 +202,10 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) float pos; float iconPos; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; - for (int k = 0, e = (int) w; k < e; ++k) - { + for (int k = 0, e = (int) w; k < e; ++k) { pos = k / w; iconPos = m + d * pos - s; tess.addVertexWithUV(pos, 0, -depth, iconPos, yMax[i]); @@ -252,13 +220,11 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) tess.setNormal(1, 0, 0); float posEnd; - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; float d2 = 1f / w; - for (int k = 0, e = (int) w; k < e; ++k) - { + for (int k = 0, e = (int) w; k < e; ++k) { pos = k / w; iconPos = m + d * pos - s; posEnd = pos + d2; @@ -273,13 +239,11 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) tess.startDrawingQuads(); tess.setNormal(0, 1, 0); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; float d2 = 1f / h; - for (int k = 0, e = (int) h; k < e; ++k) - { + for (int k = 0, e = (int) h; k < e; ++k) { pos = k / h; iconPos = m + d * pos - s; posEnd = pos + d2; @@ -294,12 +258,10 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) tess.startDrawingQuads(); tess.setNormal(0, -1, 0); - for (int i = 0; i < iconParts; ++i) - { + for (int i = 0; i < iconParts; ++i) { tess.setColorOpaque_I(color[i]); float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; - for (int k = 0, e = (int) h; k < e; ++k) - { + for (int k = 0, e = (int) h; k < e; ++k) { pos = k / h; iconPos = m + d * pos - s; tess.addVertexWithUV(1, pos, 0, xMin[i], iconPos); diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index e100f450bd9..85e68174a7e 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -12,32 +12,27 @@ import tconstruct.world.TinkerWorld; @SideOnly(Side.CLIENT) -public class ExplosiveRender extends Render -{ +public class ExplosiveRender extends Render { private RenderBlocks blockRenderer = new RenderBlocks(); - public ExplosiveRender() - { + public ExplosiveRender() { this.shadowSize = 0.5F; } - public void renderPrimedTNT (ExplosivePrimed par1EntityTNTPrimed, double par2, double par4, double par6, float par8, float par9) - { + public void renderPrimedTNT( + ExplosivePrimed par1EntityTNTPrimed, double par2, double par4, double par6, float par8, float par9) { GL11.glPushMatrix(); GL11.glTranslatef((float) par2, (float) par4, (float) par6); float f2; - if ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F < 10.0F) - { + if ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F < 10.0F) { f2 = 1.0F - ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F) / 10.0F; - if (f2 < 0.0F) - { + if (f2 < 0.0F) { f2 = 0.0F; } - if (f2 > 1.0F) - { + if (f2 > 1.0F) { f2 = 1.0F; } @@ -51,8 +46,7 @@ public void renderPrimedTNT (ExplosivePrimed par1EntityTNTPrimed, double par2, d this.bindEntityTexture(par1EntityTNTPrimed); this.blockRenderer.renderBlockAsItem(TinkerWorld.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); - if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) - { + if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) { GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); @@ -68,8 +62,7 @@ public void renderPrimedTNT (ExplosivePrimed par1EntityTNTPrimed, double par2, d GL11.glPopMatrix(); } - protected ResourceLocation func_110808_a (ExplosivePrimed par1EntityTNTPrimed) - { + protected ResourceLocation func_110808_a(ExplosivePrimed par1EntityTNTPrimed) { return TextureMap.locationBlocksTexture; } @@ -78,8 +71,7 @@ protected ResourceLocation func_110808_a (ExplosivePrimed par1EntityTNTPrimed) * unless you call Render.bindEntityTexture. */ @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110808_a((ExplosivePrimed) par1Entity); } @@ -92,8 +84,7 @@ protected ResourceLocation getEntityTexture (Entity par1Entity) * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.renderPrimedTNT((ExplosivePrimed) par1Entity, par2, par4, par6, par8, par9); } } diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 3a8ad1046df..26aaee09f85 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -16,21 +16,22 @@ @SideOnly(Side.CLIENT) @Deprecated -public class ArrowRender extends Render -{ - private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); +public class ArrowRender extends Render { + private static final ResourceLocation RES_ITEM_GLINT = + new ResourceLocation("textures/misc/enchanted_item_glint.png"); private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ private Random random = new Random(); + public boolean renderWithColor = true; /** Defines the zLevel of rendering of item on GUI. */ public float zLevel; + public static boolean renderInFrame; - public ArrowRender() - { + public ArrowRender() { this.shadowSize = 0.15F; this.shadowOpaque = 0.75F; } @@ -38,14 +39,13 @@ public ArrowRender() /** * Renders the item */ - public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) - { + public void doRenderItem( + ArrowEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) { this.bindEntityTexture(par1ArrowEntity); this.random.setSeed(187L); ItemStack itemstack = par1ArrowEntity.getEntityItem(); - if (itemstack.getItem() != null) - { + if (itemstack.getItem() != null) { GL11.glPushMatrix(); float f2 = shouldBob() ? MathHelper.sin(((float) 0 + par9) / 10.0F + 0) * 0.1F + 0.1F : 0F; float f3 = (((float) 0 + par9) / 20.0F + 0) * (180F / (float) Math.PI); @@ -61,26 +61,25 @@ public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, Block block = null; block = BlockUtils.getBlockFromItem(itemstack.getItem()); - if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) - { + if (itemstack.getItemSpriteNumber() == 0 + && block != null + && RenderBlocks.renderItemIn3d( + BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); float f7 = 0.25F; int j = block.getRenderType(); - if (j == 1 || j == 19 || j == 12 || j == 2) - { + if (j == 1 || j == 19 || j == 12 || j == 2) { f7 = 0.5F; } GL11.glScalef(f7, f7, f7); - for (i = 0; i < b0; ++i) - { + for (i = 0; i < b0; ++i) { GL11.glPushMatrix(); - if (i > 0) - { + if (i > 0) { f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; @@ -91,53 +90,41 @@ public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } - } - else - { + } else { float f8; - if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) - { + if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) { GL11.glScalef(0.5F, 0.5F, 0.5F); - for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) - { + for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { this.random.setSeed(187L); IIcon icon = itemstack.getItem().getIcon(itemstack, k); f8 = 1.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { i = itemstack.getItem().getColorFromItemStack(itemstack, k); f5 = (float) (i >> 16 & 255) / 255.0F; f4 = (float) (i >> 8 & 255) / 255.0F; f6 = (float) (i & 255) / 255.0F; GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); - } - else - { + } else { this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); } } - } - else - { + } else { GL11.glScalef(0.5F, 0.5F, 0.5F); IIcon icon1 = itemstack.getIconIndex(); - if (this.renderWithColor) - { + if (this.renderWithColor) { int l = itemstack.getItem().getColorFromItemStack(itemstack, 0); f8 = (float) (l >> 16 & 255) / 255.0F; float f9 = (float) (l >> 8 & 255) / 255.0F; f5 = (float) (l & 255) / 255.0F; f4 = 1.0F; this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); - } - else - { + } else { this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, 1.0F, 1.0F, 1.0F); } } @@ -148,27 +135,27 @@ public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, } } - protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity) - { - return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + protected ResourceLocation func_110796_a(ArrowEntity par1ArrowEntity) { + return this.renderManager.renderEngine.getResourceLocation( + par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } /** * Renders a dropped item */ - private void renderDroppedItem (ArrowEntity par1ArrowEntity, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) - { + private void renderDroppedItem( + ArrowEntity par1ArrowEntity, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) { renderDroppedItem(par1ArrowEntity, par2Icon, par3, par4, par5, par6, par7, 0); } - private void renderDroppedItem (ArrowEntity arrow, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) - { + private void renderDroppedItem( + ArrowEntity arrow, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) { Tessellator tessellator = Tessellator.instance; - if (par2Icon == null) - { + if (par2Icon == null) { TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ResourceLocation resourcelocation = texturemanager.getResourceLocation(arrow.getEntityItem().getItemSpriteNumber()); + ResourceLocation resourcelocation = + texturemanager.getResourceLocation(arrow.getEntityItem().getItemSpriteNumber()); par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } @@ -193,39 +180,47 @@ private void renderDroppedItem (ArrowEntity arrow, IIcon par2Icon, int par3, flo GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); - for (int k = 0; k < b0; ++k) - { - GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par4 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par4 - 45.0F, 0.0F, 0.0F, 1.0F); + for (int k = 0; k < b0; ++k) { + GL11.glRotatef( + arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par4 - 90.0F, + 0.0F, + 1.0F, + 0.0F); + GL11.glRotatef( + arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par4 - 45.0F, + 0.0F, + 0.0F, + 1.0F); // Makes items offset when in 3D, like when in 2D, looks much // better. Considered a vanilla bug... - if (k > 0 && shouldSpreadItems()) - { + if (k > 0 && shouldSpreadItems()) { float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; GL11.glTranslatef(x, y, f12 + f11); - } - else - { + } else { GL11.glTranslatef(0f, 0f, f12 + f11); } - if (itemstack.getItemSpriteNumber() == 0) - { + if (itemstack.getItemSpriteNumber() == 0) { this.bindTexture(TextureMap.locationBlocksTexture); - } - else - { + } else { this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12); - - if (itemstack.hasEffect(pass)) - { + ItemRenderer.renderItemIn2D( + tessellator, + f5, + f6, + f4, + f7, + ((IIcon) par2Icon).getIconWidth(), + ((IIcon) par2Icon).getIconHeight(), + f12); + + if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT); @@ -260,8 +255,7 @@ private void renderDroppedItem (ArrowEntity arrow, IIcon par2Icon, int par3, flo } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((ArrowEntity) par1Entity); } @@ -274,28 +268,25 @@ protected ResourceLocation getEntityTexture (Entity par1Entity) * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.doRenderItem((ArrowEntity) par1Entity, par2, par4, par6, par8, par9); } /** * Items should spread out when rendered in 3d? - * + * * @return */ - public boolean shouldSpreadItems () - { + public boolean shouldSpreadItems() { return false; } /** * Items should have a bob effect - * + * * @return */ - public boolean shouldBob () - { + public boolean shouldBob() { return false; } } diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index c20ec110207..811f981aedd 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -14,30 +14,30 @@ @SideOnly(Side.CLIENT) @Deprecated -public class ArrowRenderCustom extends Render -{ +public class ArrowRenderCustom extends Render { private static RenderItem renderer = new RenderItem(); private Random random = new Random(); - public ArrowRenderCustom() - { - } + public ArrowRenderCustom() {} /** * Renders the item */ - public void doRenderItem (ArrowEntity arrow, double par2, double par4, double par6, float par8, float par9) - { + public void doRenderItem(ArrowEntity arrow, double par2, double par4, double par6, float par8, float par9) { random.setSeed(187L); ItemStack item = arrow.getEntityItem(); GL11.glPushMatrix(); GL11.glTranslatef((float) par2, (float) par4, (float) par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glRotatef(arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par9 - 45.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef( + arrow.prevRotationYaw + (arrow.rotationYaw - arrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef( + arrow.prevRotationPitch + (arrow.rotationPitch - arrow.prevRotationPitch) * par9 - 45.0F, + 0.0F, + 0.0F, + 1.0F); float shake = arrow.arrowShake - par9; - if (shake > 0.0F) - GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); + if (shake > 0.0F) GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); float scale = 1.35f; GL11.glScalef(scale, scale, scale); @@ -49,16 +49,24 @@ public void doRenderItem (ArrowEntity arrow, double par2, double par4, double pa /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemAndEffectIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -66,8 +74,12 @@ public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureMa * Renders the item's overlay information. Examples being stack count or * damage on top of the item's image at the specified position. */ - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemOverlayIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -80,19 +92,17 @@ public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureMana * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.doRenderItem((ArrowEntity) par1Entity, par2, par4, par6, par8, par9); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((ArrowEntity) par1Entity); } - protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity) - { - return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + protected ResourceLocation func_110796_a(ArrowEntity par1ArrowEntity) { + return this.renderManager.renderEngine.getResourceLocation( + par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 3d085afd7bb..5e3b02c751a 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -18,21 +18,22 @@ @SideOnly(Side.CLIENT) @Deprecated -public class DaggerRender extends Render -{ - private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); +public class DaggerRender extends Render { + private static final ResourceLocation RES_ITEM_GLINT = + new ResourceLocation("textures/misc/enchanted_item_glint.png"); private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ private Random random = new Random(); + public boolean renderWithColor = true; /** Defines the zLevel of rendering of item on GUI. */ public float zLevel; + public static boolean renderInFrame = true; - public DaggerRender() - { + public DaggerRender() { this.shadowSize = 0.15F; this.shadowOpaque = 0.75F; } @@ -40,14 +41,13 @@ public DaggerRender() /** * Renders the item */ - public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) - { + public void doRenderItem( + DaggerEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9) { this.bindEntityTexture(par1ArrowEntity); this.random.setSeed(187L); ItemStack itemstack = par1ArrowEntity.getEntityItem(); - if (itemstack.getItem() != null) - { + if (itemstack.getItem() != null) { GL11.glPushMatrix(); float f2 = shouldBob() ? MathHelper.sin(((float) 0 + par9) / 10.0F + 0) * 0.1F + 0.1F : 0F; float f3 = (((float) 0 + par9) / 20.0F + 0) * (180F / (float) Math.PI); @@ -62,12 +62,13 @@ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4 Block block = BlockUtils.getBlockFromItem(itemstack.getItem()); - if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) - { + if (itemstack.getItemSpriteNumber() == 0 + && block != null + && RenderBlocks.renderItemIn3d( + BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - if (renderInFrame) - { + if (renderInFrame) { GL11.glScalef(1.25F, 1.25F, 1.25F); GL11.glTranslatef(0.0F, 0.05F, 0.0F); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); @@ -76,19 +77,16 @@ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4 float f7 = 0.25F; int j = block.getRenderType(); - if (j == 1 || j == 19 || j == 12 || j == 2) - { + if (j == 1 || j == 19 || j == 12 || j == 2) { f7 = 0.5F; } GL11.glScalef(f7, f7, f7); - for (i = 0; i < b0; ++i) - { + for (i = 0; i < b0; ++i) { GL11.glPushMatrix(); - if (i > 0) - { + if (i > 0) { f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; @@ -99,69 +97,51 @@ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4 this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } - } - else - { + } else { float f8; - if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) - { - if (renderInFrame) - { + if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) { + if (renderInFrame) { GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { + } else { GL11.glScalef(0.5F, 0.5F, 0.5F); } - for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) - { + for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { this.random.setSeed(187L); IIcon icon = itemstack.getItem().getIcon(itemstack, k); f8 = 1.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { i = itemstack.getItem().getColorFromItemStack(itemstack, k); f5 = (float) (i >> 16 & 255) / 255.0F; f4 = (float) (i >> 8 & 255) / 255.0F; f6 = (float) (i & 255) / 255.0F; GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); - } - else - { + } else { this.renderDroppedItem(par1ArrowEntity, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); } } - } - else - { - if (renderInFrame) - { + } else { + if (renderInFrame) { GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { + } else { GL11.glScalef(0.5F, 0.5F, 0.5F); } IIcon icon1 = itemstack.getIconIndex(); - if (this.renderWithColor) - { + if (this.renderWithColor) { int l = itemstack.getItem().getColorFromItemStack(itemstack, 0); f8 = (float) (l >> 16 & 255) / 255.0F; float f9 = (float) (l >> 8 & 255) / 255.0F; f5 = (float) (l & 255) / 255.0F; f4 = 1.0F; this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); - } - else - { + } else { this.renderDroppedItem(par1ArrowEntity, icon1, b0, par9, 1.0F, 1.0F, 1.0F); } } @@ -172,27 +152,27 @@ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4 } } - protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity) - { - return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + protected ResourceLocation func_110796_a(DaggerEntity par1ArrowEntity) { + return this.renderManager.renderEngine.getResourceLocation( + par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } /** * Renders a dropped item */ - private void renderDroppedItem (DaggerEntity par1ArrowEntity, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) - { + private void renderDroppedItem( + DaggerEntity par1ArrowEntity, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) { renderDroppedItem(par1ArrowEntity, par2Icon, par3, par4, par5, par6, par7, 0); } - private void renderDroppedItem (DaggerEntity dagger, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) - { + private void renderDroppedItem( + DaggerEntity dagger, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) { Tessellator tessellator = Tessellator.instance; - if (par2Icon == null) - { + if (par2Icon == null) { TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ResourceLocation resourcelocation = texturemanager.getResourceLocation(dagger.getEntityItem().getItemSpriteNumber()); + ResourceLocation resourcelocation = + texturemanager.getResourceLocation(dagger.getEntityItem().getItemSpriteNumber()); par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } @@ -213,12 +193,9 @@ private void renderDroppedItem (DaggerEntity dagger, IIcon par2Icon, int par3, f GL11.glPushMatrix(); - if (renderInFrame) - { + if (renderInFrame) { GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - else - { + } else { GL11.glRotatef((((float) 0 + par4) / 20.0F + 0) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); } @@ -230,25 +207,29 @@ private void renderDroppedItem (DaggerEntity dagger, IIcon par2Icon, int par3, f GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); - for (int k = 0; k < b0; ++k) - { + for (int k = 0; k < b0; ++k) { // Makes items offset when in 3D, like when in 2D, looks much // better. Considered a vanilla bug... GL11.glTranslatef(0f, 0f, f12 + f11); - if (itemstack.getItemSpriteNumber() == 0) - { + if (itemstack.getItemSpriteNumber() == 0) { this.bindTexture(TextureMap.locationBlocksTexture); - } - else - { + } else { this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); GL11.glRotatef(rotation, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12); + ItemRenderer.renderItemIn2D( + tessellator, + f5, + f6, + f4, + f7, + ((IIcon) par2Icon).getIconWidth(), + ((IIcon) par2Icon).getIconHeight(), + f12); /* * if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); @@ -280,13 +261,22 @@ private void renderDroppedItem (DaggerEntity dagger, IIcon par2Icon, int par3, f /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, false); } - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, boolean renderEffect) - { + public void renderItemIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5, + boolean renderEffect) { Item k = par3ItemStack.getItem(); int l = par3ItemStack.getItemDamage(); Object object = par3ItemStack.getIconIndex(); @@ -296,8 +286,9 @@ public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par float f2; Block block = BlockUtils.getBlockFromItem(k); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(k).getRenderType())) - { + if (par3ItemStack.getItemSpriteNumber() == 0 + && block != null + && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(k).getRenderType())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); @@ -311,8 +302,7 @@ public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par f1 = (float) (i1 >> 8 & 255) / 255.0F; f2 = (float) (i1 & 255) / 255.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { GL11.glColor4f(f, f1, f2, 1.0F); } @@ -321,44 +311,42 @@ public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); this.itemRenderBlocks.useInventoryTint = true; GL11.glPopMatrix(); - } - else if (k.requiresMultipleRenderPasses()) - { + } else if (k.requiresMultipleRenderPasses()) { GL11.glDisable(GL11.GL_LIGHTING); - for (int j1 = 0; j1 < k.getRenderPasses(l); ++j1) - { - par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); + for (int j1 = 0; j1 < k.getRenderPasses(l); ++j1) { + par2TextureManager.bindTexture( + par3ItemStack.getItemSpriteNumber() == 0 + ? TextureMap.locationBlocksTexture + : TextureMap.locationItemsTexture); IIcon icon = k.getIcon(par3ItemStack, j1); int k1 = k.getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; f2 = (float) (k1 >> 8 & 255) / 255.0F; float f3 = (float) (k1 & 255) / 255.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { GL11.glColor4f(f1, f2, f3, 1.0F); } this.renderIcon(par4, par5, icon, 16, 16); - if (par3ItemStack.hasEffect(j1)) - { + if (par3ItemStack.hasEffect(j1)) { renderEffect(par2TextureManager, par4, par5); } } GL11.glEnable(GL11.GL_LIGHTING); - } - else - { + } else { GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); + ResourceLocation resourcelocation = + par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); par2TextureManager.bindTexture(resourcelocation); - if (object == null) - { - object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno"); + if (object == null) { + object = ((TextureMap) + Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)) + .getAtlasSprite("missingno"); } i1 = k.getColorFromItemStack(par3ItemStack, 0); @@ -366,16 +354,14 @@ else if (k.requiresMultipleRenderPasses()) f1 = (float) (i1 >> 8 & 255) / 255.0F; f2 = (float) (i1 & 255) / 255.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { GL11.glColor4f(f, f1, f2, 1.0F); } this.renderIcon(par4, par5, (IIcon) object, 16, 16); GL11.glEnable(GL11.GL_LIGHTING); - if (par3ItemStack.hasEffect(0)) - { + if (par3ItemStack.hasEffect(0)) { renderEffect(par2TextureManager, par4, par5); } } @@ -383,8 +369,7 @@ else if (k.requiresMultipleRenderPasses()) GL11.glEnable(GL11.GL_CULL_FACE); } - private void renderEffect (TextureManager manager, int x, int y) - { + private void renderEffect(TextureManager manager, int x, int y) { GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); @@ -404,12 +389,16 @@ private void renderEffect (TextureManager manager, int x, int y) /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - if (par3ItemStack != null) - { - if (!ForgeHooksClient.renderInventoryItem(field_147909_c, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5)) - { + public void renderItemAndEffectIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { + if (par3ItemStack != null) { + if (!ForgeHooksClient.renderInventoryItem( + field_147909_c, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) + par5)) { this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true); } @@ -430,37 +419,51 @@ public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureMa } } - private void renderGlint (int par1, int par2, int par3, int par4, int par5) - { - for (int j1 = 0; j1 < 2; ++j1) - { - if (j1 == 0) - { + private void renderGlint(int par1, int par2, int par3, int par4, int par5) { + for (int j1 = 0; j1 < 2; ++j1) { + if (j1 == 0) { GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); } - if (j1 == 1) - { + if (j1 == 1) { GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); } float f = 0.00390625F; float f1 = 0.00390625F; - float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; + float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) + / (3000.0F + (float) (j1 * 1873)) + * 256.0F; float f3 = 0.0F; Tessellator tessellator = Tessellator.instance; float f4 = 4.0F; - if (j1 == 1) - { + if (j1 == 1) { f4 = -1.0F; } tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + 0), + (double) (par3 + par5), + (double) this.zLevel, + (double) ((f2 + (float) par5 * f4) * f), + (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + par4), + (double) (par3 + par5), + (double) this.zLevel, + (double) ((f2 + (float) par4 + (float) par5 * f4) * f), + (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + par4), + (double) (par3 + 0), + (double) this.zLevel, + (double) ((f2 + (float) par4) * f), + (double) ((f3 + 0.0F) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) + ((f3 + 0.0F) * f1)); tessellator.draw(); } } @@ -469,29 +472,42 @@ private void renderGlint (int par1, int par2, int par3, int par4, int par5) * Renders the item's overlay information. Examples being stack count or * damage on top of the item's image at the specified position. */ - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemOverlayIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, (String) null); } - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, String par6Str) - { - if (par3ItemStack != null) - { - if (par3ItemStack.stackSize > 1 || par6Str != null) - { + public void renderItemOverlayIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5, + String par6Str) { + if (par3ItemStack != null) { + if (par3ItemStack.stackSize > 1 || par6Str != null) { String s1 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); - par1FontRenderer.drawStringWithShadow(s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); + par1FontRenderer.drawStringWithShadow( + s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); } - if (par3ItemStack.isItemDamaged()) - { - int k = (int) Math.round(13.0D - (double) par3ItemStack.getItemDamageForDisplay() * 13.0D / (double) par3ItemStack.getMaxDamage()); - int l = (int) Math.round(255.0D - (double) par3ItemStack.getItemDamageForDisplay() * 255.0D / (double) par3ItemStack.getMaxDamage()); + if (par3ItemStack.isItemDamaged()) { + int k = (int) Math.round(13.0D + - (double) par3ItemStack.getItemDamageForDisplay() + * 13.0D + / (double) par3ItemStack.getMaxDamage()); + int l = (int) Math.round(255.0D + - (double) par3ItemStack.getItemDamageForDisplay() + * 255.0D + / (double) par3ItemStack.getMaxDamage()); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_TEXTURE_2D); @@ -513,8 +529,7 @@ public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureMana * Adds a quad to the tesselator at the specified position with the set * width and height and color. Args: tessellator, x, y, width, height, color */ - private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) - { + private void renderQuad(Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) { par1Tessellator.startDrawingQuads(); par1Tessellator.setColorOpaque_I(par6); par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); @@ -524,20 +539,29 @@ private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int pa par1Tessellator.draw(); } - public void renderIcon (int par1, int par2, IIcon par3Icon, int par4, int par5) - { + public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMaxV()); - tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMaxV()); - tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMinV()); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMinV()); + tessellator.addVertexWithUV( + (double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) + par3Icon.getMaxV()); + tessellator.addVertexWithUV( + (double) (par1 + par4), + (double) (par2 + par5), + (double) this.zLevel, + (double) par3Icon.getMaxU(), + (double) par3Icon.getMaxV()); + tessellator.addVertexWithUV( + (double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) + par3Icon.getMinV()); + tessellator.addVertexWithUV( + (double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) + par3Icon.getMinV()); tessellator.draw(); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((DaggerEntity) par1Entity); } @@ -550,61 +574,49 @@ protected ResourceLocation getEntityTexture (Entity par1Entity) * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9); } /** * Items should spread out when rendered in 3d? - * + * * @return */ - public boolean shouldSpreadItems () - { + public boolean shouldSpreadItems() { return true; } /** * Items should have a bob effect - * + * * @return */ - public boolean shouldBob () - { + public boolean shouldBob() { return true; } - public byte getMiniBlockCount (ItemStack stack) - { + public byte getMiniBlockCount(ItemStack stack) { byte ret = 1; - if (stack.stackSize > 1) - ret = 2; - if (stack.stackSize > 5) - ret = 3; - if (stack.stackSize > 20) - ret = 4; - if (stack.stackSize > 40) - ret = 5; + if (stack.stackSize > 1) ret = 2; + if (stack.stackSize > 5) ret = 3; + if (stack.stackSize > 20) ret = 4; + if (stack.stackSize > 40) ret = 5; return ret; } /** * Allows for a subclass to override how many rendered items appear in a * "mini item 3d stack" - * + * * @param stack * @return */ - public byte getMiniItemCount (ItemStack stack) - { + public byte getMiniItemCount(ItemStack stack) { byte ret = 1; - if (stack.stackSize > 1) - ret = 2; - if (stack.stackSize > 15) - ret = 3; - if (stack.stackSize > 31) - ret = 4; + if (stack.stackSize > 1) ret = 2; + if (stack.stackSize > 15) ret = 3; + if (stack.stackSize > 31) ret = 4; return ret; } } diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index bfe43abf403..7d9069c8ee9 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -15,14 +15,12 @@ @SideOnly(Side.CLIENT) @Deprecated -public class DaggerRenderCustom extends Render -{ +public class DaggerRenderCustom extends Render { private static RenderItem renderer = new RenderItem(); private static ToolCoreRenderer toolCoreRenderer = new ToolCoreRenderer(true, true); private Random random = new Random(); - public DaggerRenderCustom() - { + public DaggerRenderCustom() { this.shadowSize = 0.15F; this.shadowOpaque = 0.75F; } @@ -30,25 +28,33 @@ public DaggerRenderCustom() /** * Renders the item */ - public void doRenderItem (DaggerEntity dagger, double par2, double par4, double par6, float par8, float par9) - { + public void doRenderItem(DaggerEntity dagger, double par2, double par4, double par6, float par8, float par9) { random.setSeed(187L); ItemStack item = dagger.getEntityItem(); GL11.glPushMatrix(); GL11.glTranslatef((float) par2, (float) par4, (float) par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glRotatef(dagger.prevRotationYaw + (dagger.rotationYaw - dagger.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par9 - 45.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef( + dagger.prevRotationYaw + (dagger.rotationYaw - dagger.prevRotationYaw) * par9 - 90.0F, + 0.0F, + 1.0F, + 0.0F); + GL11.glRotatef( + dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par9 - 45.0F, + 0.0F, + 0.0F, + 1.0F); float rotation = dagger.prevRotationPitch + (dagger.rotationPitch - dagger.prevRotationPitch) * par9; GL11.glRotatef(dagger.rotationYaw + 90, 0.0F, 0.0F, 1.0F); GL11.glRotatef(rotation * 15, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.25f, -0.25f, 0f); // translate to the middle. This makes it so that the dagger rotates around its center + GL11.glTranslatef( + -0.25f, -0.25f, + 0f); // translate to the middle. This makes it so that the dagger rotates around its center float shake = dagger.arrowShake - par9; - if (shake > 0.0F) - GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); - //GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); + if (shake > 0.0F) GL11.glRotatef(-MathHelper.sin(shake * 3) * shake, 0, 0, 1); + // GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); float scale = 1.35f; GL11.glScalef(scale, scale, scale); @@ -66,16 +72,24 @@ public void doRenderItem (DaggerEntity dagger, double par2, double par4, double /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemAndEffectIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderer.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -83,8 +97,12 @@ public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureMa * Renders the item's overlay information. Examples being stack count or * damage on top of the item's image at the specified position. */ - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemOverlayIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderer.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5); } @@ -97,19 +115,17 @@ public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureMana * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((DaggerEntity) par1Entity); } - protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity) - { - return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + protected ResourceLocation func_110796_a(DaggerEntity par1ArrowEntity) { + return this.renderManager.renderEngine.getResourceLocation( + par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index f757a11f20e..957d7d8d9ed 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -12,19 +12,16 @@ import tconstruct.tools.entity.LaunchedPotion; @SideOnly(Side.CLIENT) -public class LaunchedItemRender extends Render -{ +public class LaunchedItemRender extends Render { private Item field_94151_a; private int field_94150_f; - public LaunchedItemRender(Item par1Item, int par2) - { + public LaunchedItemRender(Item par1Item, int par2) { this.field_94151_a = par1Item; this.field_94150_f = par2; } - public LaunchedItemRender(Item par1Item) - { + public LaunchedItemRender(Item par1Item) { this(par1Item, 0); } @@ -37,12 +34,10 @@ public LaunchedItemRender(Item par1Item) * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { IIcon icon = this.field_94151_a.getIconFromDamage(this.field_94150_f); - if (icon != null) - { + if (icon != null) { GL11.glPushMatrix(); GL11.glTranslatef((float) par2, (float) par4, (float) par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -50,8 +45,7 @@ public void doRender (Entity par1Entity, double par2, double par4, double par6, this.bindEntityTexture(par1Entity); Tessellator tessellator = Tessellator.instance; - if (icon == ItemPotion.func_94589_d("bottle_splash")) - { + if (icon == ItemPotion.func_94589_d("bottle_splash")) { int i = PotionHelper.func_77915_a(((LaunchedPotion) par1Entity).getPotionDamage(), false); float f2 = (float) (i >> 16 & 255) / 255.0F; float f3 = (float) (i >> 8 & 255) / 255.0F; @@ -70,13 +64,11 @@ public void doRender (Entity par1Entity, double par2, double par4, double par6, } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return TextureMap.locationItemsTexture; } - private void func_77026_a (Tessellator par1Tessellator, IIcon par2Icon) - { + private void func_77026_a(Tessellator par1Tessellator, IIcon par2Icon) { float f = par2Icon.getMinU(); float f1 = par2Icon.getMaxU(); float f2 = par2Icon.getMinV(); @@ -94,5 +86,4 @@ private void func_77026_a (Tessellator par1Tessellator, IIcon par2Icon) par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); par1Tessellator.draw(); } - } diff --git a/src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java b/src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java index f395dc6b405..4c748d6c518 100644 --- a/src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java +++ b/src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java @@ -4,19 +4,13 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; -public abstract class RangedRenderBase extends Render -{ - public RangedRenderBase() - { - } +public abstract class RangedRenderBase extends Render { + public RangedRenderBase() {} @Override - public void doRender (Entity entity, double d, double d1, double d2, float f, float f1) - { - } + public void doRender(Entity entity, double d, double d1, double d2, float f, float f1) {} - public void renderItem (Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) - { + public void renderItem(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) { tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); tessellator.addVertexWithUV(0.0D, 0.0D - (double) f5, 0.0D, f1, f3); @@ -33,8 +27,7 @@ public void renderItem (Tessellator tessellator, float f, float f1, float f2, fl tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - for (int i = 0; i < 16; i++) - { + for (int i = 0; i < 16; i++) { float f6 = (float) i / 16F; float f10 = (f1 + (f - f1) * f6) - 0.001953125F; float f14 = f4 * f6 + 0.0625F; @@ -47,8 +40,7 @@ public void renderItem (Tessellator tessellator, float f, float f1, float f2, fl tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - for (int j = 0; j < 16; j++) - { + for (int j = 0; j < 16; j++) { float f7 = (float) j / 16F; float f11 = (f1 + (f - f1) * f7) - 0.001953125F; float f15 = f4 * f7; @@ -61,8 +53,7 @@ public void renderItem (Tessellator tessellator, float f, float f1, float f2, fl tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - for (int k = 0; k < 16; k++) - { + for (int k = 0; k < 16; k++) { float f8 = (float) k / 16F; float f12 = (f3 + (f2 - f3) * f8) - 0.001953125F; float f16 = f4 * f8; @@ -75,8 +66,7 @@ public void renderItem (Tessellator tessellator, float f, float f1, float f2, fl tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - for (int l = 0; l < 16; l++) - { + for (int l = 0; l < 16; l++) { float f9 = (float) l / 16F; float f13 = (f3 + (f2 - f3) * f9) - 0.001953125F; float f17 = f4 * f9 + 0.0625F; diff --git a/src/main/java/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java index 3fe662b7966..7ab1e278b0b 100644 --- a/src/main/java/tconstruct/client/pages/BlockCastPage.java +++ b/src/main/java/tconstruct/client/pages/BlockCastPage.java @@ -8,17 +8,14 @@ import org.lwjgl.opengl.*; import org.w3c.dom.*; -public class BlockCastPage extends BookPage -{ +public class BlockCastPage extends BookPage { String text; ItemStack[] icons; @Override - public void readPageFromXML (Element element) - { + public void readPageFromXML(Element element) { NodeList nodes = element.getElementsByTagName("text"); - if (nodes != null) - text = nodes.item(0).getTextContent(); + if (nodes != null) text = nodes.item(0).getTextContent(); nodes = element.getElementsByTagName("recipe"); if (nodes != null) @@ -26,12 +23,9 @@ public void readPageFromXML (Element element) } @Override - public void renderContentLayer (int localWidth, int localHeight, boolean isTranslatable) - { - if (text != null) - { - if (isTranslatable) - text = StatCollector.translateToLocal(text); + public void renderContentLayer(int localWidth, int localHeight, boolean isTranslatable) { + if (text != null) { + if (isTranslatable) text = StatCollector.translateToLocal(text); manual.fonts.drawString("\u00a7n" + text, localWidth + 70, localHeight + 4, 0); } GL11.glScalef(2f, 2f, 2f); @@ -39,20 +33,28 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans RenderHelper.enableGUIStandardItemLighting(); manual.renderitem.zLevel = 100; - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 138) / 2, (localHeight + 110) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth + 70) / 2, (localHeight + 74) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[2], (localWidth + 70) / 2, (localHeight + 110) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 138) / 2, (localHeight + 110) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth + 70) / 2, (localHeight + 74) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[2], (localWidth + 70) / 2, (localHeight + 110) / 2); if (icons[0].stackSize > 1) - manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2, String.valueOf(icons[0].stackSize)); + manual.renderitem.renderItemOverlayIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[0], + (localWidth + 106) / 2, + (localHeight + 74) / 2, + String.valueOf(icons[0].stackSize)); manual.renderitem.zLevel = 0; GL11.glScalef(0.5F, 0.5F, 0.5F); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); String ingr = StatCollector.translateToLocal("manual.page.casting1"); - if (isTranslatable) - ingr = StatCollector.translateToLocal(ingr); + if (isTranslatable) ingr = StatCollector.translateToLocal(ingr); manual.fonts.drawString(ingr + ":", localWidth + 120, localHeight + 32, 0); manual.fonts.drawString("- " + icons[1].getDisplayName(), localWidth + 120, localHeight + 42, 0); if (icons[2] != null) @@ -62,8 +64,7 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/booksmeltery.png"); @Override - public void renderBackgroundLayer (int localWidth, int localHeight) - { + public void renderBackgroundLayer(int localWidth, int localHeight) { manual.getMC().getTextureManager().bindTexture(background); manual.drawTexturedModalRect(localWidth, localHeight + 32, 0, 0, 174, 115); manual.drawTexturedModalRect(localWidth + 62, localHeight + 105, 2, 118, 45, 45); diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index 63e6c84134c..91ce036554a 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -12,25 +12,21 @@ import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; -public class MaterialPage extends BookPage -{ +public class MaterialPage extends BookPage { String title; ItemStack[] icons; String iconText; ToolMaterial material; @Override - public void readPageFromXML (Element element) - { + public void readPageFromXML(Element element) { NodeList nodes = element.getElementsByTagName("title"); - if (nodes != null) - title = nodes.item(0).getTextContent(); + if (nodes != null) title = nodes.item(0).getTextContent(); icons = new ItemStack[4]; nodes = element.getElementsByTagName("text"); - if (nodes != null) - iconText = nodes.item(0).getTextContent(); + if (nodes != null) iconText = nodes.item(0).getTextContent(); nodes = element.getElementsByTagName("icon"); if (nodes != null) @@ -39,8 +35,7 @@ public void readPageFromXML (Element element) nodes = element.getElementsByTagName("toolmaterial"); if (nodes != null && nodes.getLength() > 0) material = TConstructRegistry.getMaterial(nodes.item(0).getTextContent()); - else - material = TConstructRegistry.getMaterial(title); + else material = TConstructRegistry.getMaterial(title); nodes = element.getElementsByTagName("material").item(0).getChildNodes(); @@ -50,8 +45,7 @@ public void readPageFromXML (Element element) } @Override - public void renderContentLayer (int localWidth, int localHeight, boolean isTranslatable) - { + public void renderContentLayer(int localWidth, int localHeight, boolean isTranslatable) { String mat = StatCollector.translateToLocal("manual.page.material.material"); String shard = StatCollector.translateToLocal("manual.page.material.shard"); String rod = StatCollector.translateToLocal("manual.page.material.rod"); @@ -70,8 +64,7 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans String stoneboundLevel = StatCollector.translateToLocal("manual.page.material8"); String splinteringLevel = StatCollector.translateToLocal("manual.page.material9"); - if (isTranslatable) - { + if (isTranslatable) { title = StatCollector.translateToLocal(title); iconText = StatCollector.translateToLocal(iconText); mat = StatCollector.translateToLocal(mat); @@ -91,7 +84,6 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans reinforcedLevel = StatCollector.translateToLocal(reinforcedLevel); stoneboundLevel = StatCollector.translateToLocal(stoneboundLevel); splinteringLevel = StatCollector.translateToLocal(splinteringLevel); - } manual.fonts.drawString("\u00a7n" + title, localWidth + 70, localHeight + 4, 0); manual.fonts.drawSplitString(iconText, localWidth, localHeight + 16, 178, 0); @@ -105,75 +97,98 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans manual.renderitem.zLevel = 100; // renderitem.renderItemAndEffectIntoGUI(fonts, getMC().renderEngine, // icons[0], localWidth + 50, localHeight + 0); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[1], localWidth + 108, localHeight + 50); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[2], localWidth + 108, localHeight + 82); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[3], localWidth + 108, localHeight + 114); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[1], localWidth + 108, localHeight + 50); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[2], localWidth + 108, localHeight + 82); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[3], localWidth + 108, localHeight + 114); manual.renderitem.zLevel = 0; RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); - String icon = icons[1].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(); - if (isTranslatable) - icon = StatCollector.translateToLocal(icon); + String icon = + icons[1].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(); + if (isTranslatable) icon = StatCollector.translateToLocal(icon); int iconOffset = icon.length() > 12 ? 0 : 3; manual.fonts.drawSplitString(icon, localWidth + 128, localHeight + 50 + iconOffset, 52, 0); - if (icons[2] != null) - { + if (icons[2] != null) { icon = icons[2].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(); - if (isTranslatable) - icon = StatCollector.translateToLocal(icon); + if (isTranslatable) icon = StatCollector.translateToLocal(icon); iconOffset = icon.length() > 12 ? 0 : 3; - manual.fonts.drawSplitString(icons[2].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 82 + iconOffset, 52, 0); + manual.fonts.drawSplitString( + icons[2].getTooltip(manual.getMC().thePlayer, false) + .get((0)) + .toString(), + localWidth + 128, + localHeight + 82 + iconOffset, + 52, + 0); } - if (icons[3] != null) - { + if (icons[3] != null) { icon = icons[3].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(); - if (isTranslatable) - icon = StatCollector.translateToLocal(icon); + if (isTranslatable) icon = StatCollector.translateToLocal(icon); iconOffset = icon.length() > 12 ? 0 : 3; - manual.fonts.drawSplitString(icons[3].getTooltip(manual.getMC().thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 114 + iconOffset, 52, 0); + manual.fonts.drawSplitString( + icons[3].getTooltip(manual.getMC().thePlayer, false) + .get((0)) + .toString(), + localWidth + 128, + localHeight + 114 + iconOffset, + 52, + 0); } manual.fonts.drawString(durability + ": " + material.durability(), localWidth, localHeight + 40, 0); - manual.fonts.drawString(handleModifier + ": " + material.handleDurability() + "x", localWidth, localHeight + 50, 0); - manual.fonts.drawString(fullToolDurability + ": " + (int) (material.durability() * material.handleDurability()), localWidth, localHeight + 60, 0); + manual.fonts.drawString( + handleModifier + ": " + material.handleDurability() + "x", localWidth, localHeight + 50, 0); + manual.fonts.drawString( + fullToolDurability + ": " + (int) (material.durability() * material.handleDurability()), + localWidth, + localHeight + 60, + 0); manual.fonts.drawString(miningSpeed + ": " + material.toolSpeed() / 100f, localWidth, localHeight + 80, 0); - manual.fonts.drawString(miningLevel + ": " + material.harvestLevel() + " (" + HarvestLevels.getHarvestLevelName(material.harvestLevel()) + ")", localWidth, localHeight + 90, 0); + manual.fonts.drawString( + miningLevel + ": " + material.harvestLevel() + " (" + + HarvestLevels.getHarvestLevelName(material.harvestLevel()) + ")", + localWidth, + localHeight + 90, + 0); int attack = material.attack(); String heart = attack == 2 ? " " + heart_ : " " + hearts; if (attack % 2 == 0) - manual.fonts.drawString(baseAttack + ": " + material.attack() / 2 + heart, localWidth, localHeight + 100, 0); + manual.fonts.drawString( + baseAttack + ": " + material.attack() / 2 + heart, localWidth, localHeight + 100, 0); else - manual.fonts.drawString(baseAttack + ": " + material.attack() / 2f + heart, localWidth, localHeight + 100, 0); + manual.fonts.drawString( + baseAttack + ": " + material.attack() / 2f + heart, localWidth, localHeight + 100, 0); int offset = 0; String ability = material.ability(); - if (!ability.equals("")) - { + if (!ability.equals("")) { manual.fonts.drawString(materialTrait + ": " + ability, localWidth, localHeight + 120 + 10 * offset, 0); offset++; if (material.name().equals("Paper") || material.name().equals("Thaumium")) manual.fonts.drawString(extraMod, localWidth, localHeight + 120 + 10 * offset, 0); } - if (material.reinforced() > 0) - { + if (material.reinforced() > 0) { manual.fonts.drawString(traitReinforced, localWidth, localHeight + 120 + 10 * offset, 0); offset++; - manual.fonts.drawString(reinforcedLevel + ": " + material.reinforced(), localWidth, localHeight + 120 + 10 * offset, 0); + manual.fonts.drawString( + reinforcedLevel + ": " + material.reinforced(), localWidth, localHeight + 120 + 10 * offset, 0); offset++; } - if (material.shoddy() > 0) - { - manual.fonts.drawString(stoneboundLevel + ": " + material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0); + if (material.shoddy() > 0) { + manual.fonts.drawString( + stoneboundLevel + ": " + material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0); offset++; - } - else if (material.shoddy() < 0) - { - manual.fonts.drawString(splinteringLevel + ": " + -material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0); + } else if (material.shoddy() < 0) { + manual.fonts.drawString( + splinteringLevel + ": " + -material.shoddy(), localWidth, localHeight + 120 + 10 * offset, 0); offset++; } } diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 0a55dddaa84..694ed7d42b4 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -9,8 +9,7 @@ import org.lwjgl.opengl.*; import org.w3c.dom.*; -public class ModifierPage extends BookPage -{ +public class ModifierPage extends BookPage { String type; ItemStack[] icons; ItemStack[][] iconsMulti; @@ -20,28 +19,23 @@ public class ModifierPage extends BookPage int counter; @Override - public void readPageFromXML (Element element) - { + public void readPageFromXML(Element element) { NodeList nodes = element.getElementsByTagName("tooltype"); - if (nodes != null) - type = nodes.item(0).getTextContent(); + if (nodes != null) type = nodes.item(0).getTextContent(); nodes = element.getElementsByTagName("recipe"); - if (nodes != null) - { + if (nodes != null) { String recipe = nodes.item(0).getTextContent(); icons = MantleClientRegistry.getRecipeIcons(recipe); - if (type.equals("travelmulti")) - { + if (type.equals("travelmulti")) { List stacks = new LinkedList(); List tools = new LinkedList(); - String[] suffixes = new String[] { "goggles", "vest", "wings", "boots", "glove", "belt" }; - for (String suffix : suffixes) - { - ItemStack[] icons2 = MantleClientRegistry.getRecipeIcons(nodes.item(0).getTextContent() + suffix); - if (icons2 != null) - { + String[] suffixes = new String[] {"goggles", "vest", "wings", "boots", "glove", "belt"}; + for (String suffix : suffixes) { + ItemStack[] icons2 = + MantleClientRegistry.getRecipeIcons(nodes.item(0).getTextContent() + suffix); + if (icons2 != null) { stacks.add(icons2); tools.add(suffix); } @@ -49,8 +43,7 @@ public void readPageFromXML (Element element) iconsMulti = new ItemStack[stacks.size()][]; toolMulti = new ItemStack[stacks.size()]; - for (int i = 0; i < stacks.size(); i++) - { + for (int i = 0; i < stacks.size(); i++) { iconsMulti[i] = stacks.get(i); toolMulti[i] = MantleClientRegistry.getManualIcon("travel" + tools.get(i)); } @@ -64,67 +57,87 @@ public void readPageFromXML (Element element) } @Override - public void renderContentLayer (int localWidth, int localHeight, boolean isTranslatable) - { + public void renderContentLayer(int localWidth, int localHeight, boolean isTranslatable) { String tStation = StatCollector.translateToLocal("manual.page.modifier1"); - if (icons.length > 3) - tStation = StatCollector.translateToLocal("manual.page.modifier2"); - if (icons.length > 4) - tStation = StatCollector.translateToLocal("manual.page.modifier3"); - if (isTranslatable) - tStation = StatCollector.translateToLocal(tStation); + if (icons.length > 3) tStation = StatCollector.translateToLocal("manual.page.modifier2"); + if (icons.length > 4) tStation = StatCollector.translateToLocal("manual.page.modifier3"); + if (isTranslatable) tStation = StatCollector.translateToLocal(tStation); manual.fonts.drawString("\u00a7n" + tStation, localWidth + 60, localHeight + 4, 0); GL11.glScalef(2f, 2f, 2f); GL11.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); ItemStack toolstack = MantleClientRegistry.getManualIcon("ironpick"); - if (type.equals("weapon")) - toolstack = MantleClientRegistry.getManualIcon("ironlongsword"); - if (type.equals("travelgoggles")) - toolstack = MantleClientRegistry.getManualIcon("travelgoggles"); - if (type.equals("travelvest")) - toolstack = MantleClientRegistry.getManualIcon("travelvest"); - if (type.equals("travelwings")) - toolstack = MantleClientRegistry.getManualIcon("travelwings"); - if (type.equals("travelboots")) - toolstack = MantleClientRegistry.getManualIcon("travelboots"); - if (type.equals("travelbelt")) - toolstack = MantleClientRegistry.getManualIcon("travelbelt"); - if (type.equals("travelglove")) - toolstack = MantleClientRegistry.getManualIcon("travelglove"); - if (type.equals("travelmulti")) - toolstack = toolMulti[counter]; + if (type.equals("weapon")) toolstack = MantleClientRegistry.getManualIcon("ironlongsword"); + if (type.equals("travelgoggles")) toolstack = MantleClientRegistry.getManualIcon("travelgoggles"); + if (type.equals("travelvest")) toolstack = MantleClientRegistry.getManualIcon("travelvest"); + if (type.equals("travelwings")) toolstack = MantleClientRegistry.getManualIcon("travelwings"); + if (type.equals("travelboots")) toolstack = MantleClientRegistry.getManualIcon("travelboots"); + if (type.equals("travelbelt")) toolstack = MantleClientRegistry.getManualIcon("travelbelt"); + if (type.equals("travelglove")) toolstack = MantleClientRegistry.getManualIcon("travelglove"); + if (type.equals("travelmulti")) toolstack = toolMulti[counter]; // update displayed item - if (iconsMulti != null && iconsMulti.length > 0 && type.equals("travelmulti") && System.currentTimeMillis() - lastUpdate > 1000) - { + if (iconsMulti != null + && iconsMulti.length > 0 + && type.equals("travelmulti") + && System.currentTimeMillis() - lastUpdate > 1000) { lastUpdate = System.currentTimeMillis(); counter++; - if (counter >= iconsMulti.length) - counter = 0; + if (counter >= iconsMulti.length) counter = 0; icons = iconsMulti[counter]; toolstack = toolMulti[counter]; } manual.renderitem.zLevel = 100; - if (icons.length < 4) - { - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, toolstack, (localWidth + 54) / 2, (localHeight + 54) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 130) / 2, (localHeight + 54) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth + 18) / 2, (localHeight + 36) / 2); + if (icons.length < 4) { + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + toolstack, + (localWidth + 54) / 2, + (localHeight + 54) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[0], + (localWidth + 130) / 2, + (localHeight + 54) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth + 18) / 2, (localHeight + 36) / 2); if (icons[2] != null) - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[2], (localWidth + 18) / 2, (localHeight + 74) / 2); - } - else - { - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, toolstack, (localWidth + 74) / 2, (localHeight + 54) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], (localWidth + 140) / 2, (localHeight + 54) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth - 2) / 2, (localHeight + 36) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[2], (localWidth - 2) / 2, (localHeight + 74) / 2); - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[3], (localWidth + 36) / 2, (localHeight + 36) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[2], + (localWidth + 18) / 2, + (localHeight + 74) / 2); + } else { + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + toolstack, + (localWidth + 74) / 2, + (localHeight + 54) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[0], + (localWidth + 140) / 2, + (localHeight + 54) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[1], (localWidth - 2) / 2, (localHeight + 36) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[2], (localWidth - 2) / 2, (localHeight + 74) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[3], (localWidth + 36) / 2, (localHeight + 36) / 2); if (icons[4] != null) - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[4], (localWidth + 36) / 2, (localHeight + 74) / 2); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[4], + (localWidth + 36) / 2, + (localHeight + 74) / 2); } manual.renderitem.zLevel = 0; @@ -136,12 +149,9 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/bookmodify.png"); @Override - public void renderBackgroundLayer (int localWidth, int localHeight) - { + public void renderBackgroundLayer(int localWidth, int localHeight) { manual.getMC().getTextureManager().bindTexture(background); - if (icons.length > 3) - manual.drawTexturedModalRect(localWidth - 7, localHeight + 32, 0, 80, 182, 78); - else - manual.drawTexturedModalRect(localWidth + 12, localHeight + 32, 0, 0, 154, 78); + if (icons.length > 3) manual.drawTexturedModalRect(localWidth - 7, localHeight + 32, 0, 80, 182, 78); + else manual.drawTexturedModalRect(localWidth + 12, localHeight + 32, 0, 0, 154, 78); } } diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index d785f5e93da..9087e64db7f 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -8,33 +8,28 @@ import org.lwjgl.opengl.*; import org.w3c.dom.*; -public class ToolPage extends BookPage -{ +public class ToolPage extends BookPage { String title; ItemStack[] icons; String[] iconText; @Override - public void readPageFromXML (Element element) - { + public void readPageFromXML(Element element) { NodeList nodes = element.getElementsByTagName("title"); - if (nodes != null) - title = nodes.item(0).getTextContent(); + if (nodes != null) title = nodes.item(0).getTextContent(); nodes = element.getElementsByTagName("item"); iconText = new String[nodes.getLength() + 2]; icons = new ItemStack[nodes.getLength() + 1]; - for (int i = 0; i < nodes.getLength(); i++) - { + for (int i = 0; i < nodes.getLength(); i++) { NodeList children = nodes.item(i).getChildNodes(); iconText[i + 2] = children.item(1).getTextContent(); icons[i + 1] = MantleClientRegistry.getManualIcon(children.item(3).getTextContent()); } nodes = element.getElementsByTagName("text"); - if (nodes != null) - { + if (nodes != null) { iconText[0] = nodes.item(0).getTextContent(); iconText[1] = nodes.item(1).getTextContent(); } @@ -45,11 +40,9 @@ public void readPageFromXML (Element element) } @Override - public void renderContentLayer (int localWidth, int localHeight, boolean isTranslatable) - { + public void renderContentLayer(int localWidth, int localHeight, boolean isTranslatable) { String cParts = StatCollector.translateToLocal("manual.page.tool1"); - if (isTranslatable) - { + if (isTranslatable) { title = StatCollector.translateToLocal(title); iconText[0] = StatCollector.translateToLocal(iconText[0]); iconText[1] = StatCollector.translateToLocal(iconText[1]); @@ -66,12 +59,18 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans GL11.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); manual.renderitem.zLevel = 100; - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[0], localWidth + 50, localHeight + 0); - for (int i = 1; i < icons.length; i++) - { - manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, icons[i], localWidth + 120, localHeight + 20 + 10 * size + 18 * i); + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, manual.getMC().renderEngine, icons[0], localWidth + 50, localHeight + 0); + for (int i = 1; i < icons.length; i++) { + manual.renderitem.renderItemAndEffectIntoGUI( + manual.fonts, + manual.getMC().renderEngine, + icons[i], + localWidth + 120, + localHeight + 20 + 10 * size + 18 * i); int partOffset = iconText[i + 1].length() > 11 ? -3 : 0; - manual.fonts.drawSplitString(iconText[i + 1], localWidth + 140, localHeight + 24 + 10 * size + 18 * i + partOffset, 44, 0); + manual.fonts.drawSplitString( + iconText[i + 1], localWidth + 140, localHeight + 24 + 10 * size + 18 * i + partOffset, 44, 0); } manual.renderitem.zLevel = 0; RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java index 4f1d1b8d996..7f8be6fc2c9 100644 --- a/src/main/java/tconstruct/client/tabs/AbstractTab.java +++ b/src/main/java/tconstruct/client/tabs/AbstractTab.java @@ -8,23 +8,19 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.*; -public abstract class AbstractTab extends GuiButton -{ +public abstract class AbstractTab extends GuiButton { ResourceLocation texture = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); ItemStack renderStack; RenderItem itemRenderer = new RenderItem(); - public AbstractTab(int id, int posX, int posY, ItemStack renderStack) - { + public AbstractTab(int id, int posX, int posY, ItemStack renderStack) { super(id, posX, posY, 28, 32, ""); this.renderStack = renderStack; } @Override - public void drawButton (Minecraft mc, int mouseX, int mouseY) - { - if (this.visible) - { + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + if (this.visible) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int yTexPos = this.enabled ? 3 : 32; @@ -40,8 +36,10 @@ public void drawButton (Minecraft mc, int mouseX, int mouseY) this.itemRenderer.zLevel = 100.0F; GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - this.itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); - this.itemRenderer.renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); + this.itemRenderer.renderItemAndEffectIntoGUI( + mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); + this.itemRenderer.renderItemOverlayIntoGUI( + mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); this.itemRenderer.zLevel = 0.0F; @@ -51,19 +49,22 @@ public void drawButton (Minecraft mc, int mouseX, int mouseY) } @Override - public boolean mousePressed (Minecraft mc, int mouseX, int mouseY) - { - boolean inWindow = this.enabled && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; + public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) { + boolean inWindow = this.enabled + && this.visible + && mouseX >= this.xPosition + && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; - if (inWindow) - { + if (inWindow) { this.onTabClicked(); } return inWindow; } - public abstract void onTabClicked (); + public abstract void onTabClicked(); - public abstract boolean shouldAddToList (); + public abstract boolean shouldAddToList(); } diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java index 9de8772deb2..7d6fb9db037 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java @@ -4,22 +4,18 @@ import net.minecraft.item.ItemStack; import tconstruct.client.ArmorControls; -public class InventoryTabArmorExtended extends AbstractTab -{ - public InventoryTabArmorExtended() - { +public class InventoryTabArmorExtended extends AbstractTab { + public InventoryTabArmorExtended() { super(0, 0, 0, new ItemStack(Items.diamond_chestplate)); } @Override - public void onTabClicked () - { + public void onTabClicked() { ArmorControls.openArmorGui(); } @Override - public boolean shouldAddToList () - { + public boolean shouldAddToList() { return true; } } diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index e46c5ff1d72..e3fb70dc27d 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -4,22 +4,18 @@ import tconstruct.armor.*; import tconstruct.client.ArmorControls; -public class InventoryTabKnapsack extends AbstractTab -{ - public InventoryTabKnapsack() - { +public class InventoryTabKnapsack extends AbstractTab { + public InventoryTabKnapsack() { super(0, 0, 0, new ItemStack(TinkerArmor.knapsack)); } @Override - public void onTabClicked () - { + public void onTabClicked() { ArmorControls.openKnapsackGui(); } @Override - public boolean shouldAddToList () - { + public boolean shouldAddToList() { return ArmorProxyClient.armorExtended != null && ArmorProxyClient.armorExtended.inventory[2] != null && ArmorProxyClient.armorExtended.inventory[2].getItem() == TinkerArmor.knapsack; diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java b/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java index a2e6f15c49c..ea3ffe5e492 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java @@ -3,22 +3,18 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -public class InventoryTabVanilla extends AbstractTab -{ - public InventoryTabVanilla() - { +public class InventoryTabVanilla extends AbstractTab { + public InventoryTabVanilla() { super(0, 0, 0, new ItemStack(Blocks.crafting_table)); } @Override - public void onTabClicked () - { + public void onTabClicked() { TabRegistry.openInventoryGui(); } @Override - public boolean shouldAddToList () - { + public boolean shouldAddToList() { return true; } } diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 9cd84d0a937..1773415bde8 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -1,44 +1,37 @@ package tconstruct.client.tabs; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.lang.reflect.*; import java.util.*; - import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.network.play.client.C0DPacketCloseWindow; import net.minecraftforge.client.event.GuiScreenEvent; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -public class TabRegistry -{ +public class TabRegistry { private static ArrayList tabList = new ArrayList(); - public static void registerTab (AbstractTab tab) - { + public static void registerTab(AbstractTab tab) { tabList.add(tab); } - public static ArrayList getTabList () - { + public static ArrayList getTabList() { return tabList; } @SideOnly(Side.CLIENT) @SubscribeEvent - public void guiPostInit (GuiScreenEvent.InitGuiEvent.Post event) - { - if ((event.gui instanceof GuiInventory)) - { + public void guiPostInit(GuiScreenEvent.InitGuiEvent.Post event) { + if ((event.gui instanceof GuiInventory)) { int xSize = 176; int ySize = 166; int guiLeft = (event.gui.width - xSize) / 2; int guiTop = (event.gui.height - ySize) / 2; - guiLeft += getPotionOffset(); + guiLeft += getPotionOffset(); updateTabValues(guiLeft, guiTop, InventoryTabVanilla.class); addTabsToList(event.gui.buttonList); @@ -47,22 +40,18 @@ public void guiPostInit (GuiScreenEvent.InitGuiEvent.Post event) private static Minecraft mc = FMLClientHandler.instance().getClient(); - public static void openInventoryGui () - { + public static void openInventoryGui() { mc.thePlayer.sendQueue.addToSendQueue(new C0DPacketCloseWindow(mc.thePlayer.openContainer.windowId)); GuiInventory inventory = new GuiInventory(mc.thePlayer); mc.displayGuiScreen(inventory); } - public static void updateTabValues (int cornerX, int cornerY, Class selectedButton) - { + public static void updateTabValues(int cornerX, int cornerY, Class selectedButton) { int count = 2; - for (int i = 0; i < tabList.size(); i++) - { + for (int i = 0; i < tabList.size(); i++) { AbstractTab t = tabList.get(i); - if (t.shouldAddToList()) - { + if (t.shouldAddToList()) { t.id = count; t.xPosition = cornerX + (count - 2) * 28; t.yPosition = cornerY - 28; @@ -72,51 +61,38 @@ public static void updateTabValues (int cornerX, int cornerY, Class selectedB } } - public static void addTabsToList (List buttonList) - { - for (AbstractTab tab : tabList) - { - if (tab.shouldAddToList()) - { + public static void addTabsToList(List buttonList) { + for (AbstractTab tab : tabList) { + if (tab.shouldAddToList()) { buttonList.add(tab); } } } - - public static int getPotionOffset() - { - // If at least one potion is active... - if (!mc.thePlayer.getActivePotionEffects().isEmpty()) - { - if (Loader.isModLoaded("NotEnoughItems")) - { - try - { - // Check whether NEI is hidden and enabled - Class c = Class.forName("codechicken.nei.NEIClientConfig"); - Object hidden = c.getMethod("isHidden").invoke(null); - Object enabled = c.getMethod("isEnabled").invoke(null); - if (hidden != null && hidden instanceof Boolean && enabled != null && enabled instanceof Boolean) - { - if ((Boolean)hidden || !((Boolean)enabled)) - { - // If NEI is disabled or hidden, offset the tabs by 60 - return 60; - } - } - } - catch (Exception e) - { - } - } - else - { - // If NEI is not installed, offset the tabs - return 60; - } - } - - // No potions, no offset needed - return 0; - } + + public static int getPotionOffset() { + // If at least one potion is active... + if (!mc.thePlayer.getActivePotionEffects().isEmpty()) { + if (Loader.isModLoaded("NotEnoughItems")) { + try { + // Check whether NEI is hidden and enabled + Class c = Class.forName("codechicken.nei.NEIClientConfig"); + Object hidden = c.getMethod("isHidden").invoke(null); + Object enabled = c.getMethod("isEnabled").invoke(null); + if (hidden != null && hidden instanceof Boolean && enabled != null && enabled instanceof Boolean) { + if ((Boolean) hidden || !((Boolean) enabled)) { + // If NEI is disabled or hidden, offset the tabs by 60 + return 60; + } + } + } catch (Exception e) { + } + } else { + // If NEI is not installed, offset the tabs + return 60; + } + } + + // No potions, no offset needed + return 0; + } } diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index e16b278bee0..01d14dd6e8d 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -5,41 +5,31 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -public class TProxyCommon implements IGuiHandler -{ - public void initialize () - { - - } +public class TProxyCommon implements IGuiHandler { + public void initialize() {} @Override - public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { IGuiHandler handler = serverGuiHandlers.get(ID); - if (handler != null) - return handler.getServerGuiElement(ID, player, world, x, y, z); + if (handler != null) return handler.getServerGuiElement(ID, player, world, x, y, z); return null; } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { IGuiHandler handler = clientGuiHandlers.get(ID); - if (handler != null) - return handler.getClientGuiElement(ID, player, world, x, y, z); + if (handler != null) return handler.getClientGuiElement(ID, player, world, x, y, z); return null; } private static HashMap serverGuiHandlers = new HashMap(); private static HashMap clientGuiHandlers = new HashMap(); - public static void registerServerGuiHandler (int gui, IGuiHandler handler) - { + public static void registerServerGuiHandler(int gui, IGuiHandler handler) { serverGuiHandlers.put(gui, handler); } - public static void registerClientGuiHandler (int gui, IGuiHandler handler) - { + public static void registerClientGuiHandler(int gui, IGuiHandler handler) { clientGuiHandlers.put(gui, handler); } } diff --git a/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java b/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java index 27652cb3e94..2d6f7944db8 100644 --- a/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java +++ b/src/main/java/tconstruct/common/itemblocks/MetadataItemBlock.java @@ -3,18 +3,15 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; -public class MetadataItemBlock extends ItemBlock -{ - public MetadataItemBlock(Block b) - { +public class MetadataItemBlock extends ItemBlock { + public MetadataItemBlock(Block b) { super(b); setMaxDamage(0); setHasSubtypes(true); } @Override - public int getMetadata (int meta) - { + public int getMetadata(int meta) { return meta; } } diff --git a/src/main/java/tconstruct/gadgets/TinkerGadgets.java b/src/main/java/tconstruct/gadgets/TinkerGadgets.java index 74420ee13e4..f756205fc45 100644 --- a/src/main/java/tconstruct/gadgets/TinkerGadgets.java +++ b/src/main/java/tconstruct/gadgets/TinkerGadgets.java @@ -1,14 +1,10 @@ package tconstruct.gadgets; -import java.util.Locale; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import java.util.Locale; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import net.minecraft.init.Items; @@ -16,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.ShapedOreRecipe; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import tconstruct.TConstruct; import tconstruct.gadgets.item.ItemSlimeBoots; import tconstruct.gadgets.item.ItemSlimeSling; @@ -25,58 +23,54 @@ @Pulse(id = "Tinkers' Gadgets", description = "All the fun toys.") public class TinkerGadgets { - public static final String PulseId = "TinkerGadgets"; - public static final Logger log = LogManager.getLogger(PulseId); - - // Gadgets - public static ItemSlimeSling slimeSling; - public static ItemSlimeBoots slimeBoots; - - @Handler - public void preInit(FMLPreInitializationEvent event) { - - SlimeBounceHandler.init(); - slimeSling = registerItem(new ItemSlimeSling(), "slimesling"); - slimeBoots = registerItem(new ItemSlimeBoots(), "slime_boots"); - - } - - @Handler - public void init(FMLInitializationEvent event) { - String ore = "blockSlime"; - - GameRegistry.addRecipe( - new ShapedOreRecipe(new ItemStack(slimeBoots), " ", "s s", "b b", 's', "slimeball", 'b', ore)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(slimeSling), "fbf", "s s", " s ", 'f', Items.string, - 's', "slimeball", 'b', ore)); - TConstructRegistry.gadgetsTab.init(new ItemStack(slimeBoots)); - - } - - @Handler - public void postInit(FMLPostInitializationEvent evt) { - - } - - public static String resource(String res) { - return String.format("%s:%s", "tinker", res); - } - - public static ResourceLocation getResource(String res) { - return new ResourceLocation("tinker", res); - } - - public static String prefix(String name) { - return String.format("%s.%s", TConstruct.modID, name.toLowerCase(Locale.US)); - } - - protected static T registerItem(T item, String name) { - if (!name.equals(name.toLowerCase(Locale.US))) { - throw new IllegalArgumentException( - String.format("Unlocalized names need to be all lowercase! Item: %s", name)); - } - item.setUnlocalizedName(prefix(name)); - GameRegistry.registerItem(item, name); - return item; - } + public static final String PulseId = "TinkerGadgets"; + public static final Logger log = LogManager.getLogger(PulseId); + + // Gadgets + public static ItemSlimeSling slimeSling; + public static ItemSlimeBoots slimeBoots; + + @Handler + public void preInit(FMLPreInitializationEvent event) { + + SlimeBounceHandler.init(); + slimeSling = registerItem(new ItemSlimeSling(), "slimesling"); + slimeBoots = registerItem(new ItemSlimeBoots(), "slime_boots"); + } + + @Handler + public void init(FMLInitializationEvent event) { + String ore = "blockSlime"; + + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(slimeBoots), " ", "s s", "b b", 's', "slimeball", 'b', ore)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(slimeSling), "fbf", "s s", " s ", 'f', Items.string, 's', "slimeball", 'b', ore)); + TConstructRegistry.gadgetsTab.init(new ItemStack(slimeBoots)); + } + + @Handler + public void postInit(FMLPostInitializationEvent evt) {} + + public static String resource(String res) { + return String.format("%s:%s", "tinker", res); + } + + public static ResourceLocation getResource(String res) { + return new ResourceLocation("tinker", res); + } + + public static String prefix(String name) { + return String.format("%s.%s", TConstruct.modID, name.toLowerCase(Locale.US)); + } + + protected static T registerItem(T item, String name) { + if (!name.equals(name.toLowerCase(Locale.US))) { + throw new IllegalArgumentException( + String.format("Unlocalized names need to be all lowercase! Item: %s", name)); + } + item.setUnlocalizedName(prefix(name)); + GameRegistry.registerItem(item, name); + return item; + } } diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java index e7a052cf5ac..bb5c6f57a62 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java @@ -1,12 +1,10 @@ package tconstruct.gadgets.item; -import java.util.List; - -import javax.vecmath.Vector3d; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import javax.vecmath.Vector3d; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.resources.I18n; @@ -32,208 +30,208 @@ public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { - public static ArmorMaterial SLIME_MATERIAL = EnumHelper.addArmorMaterial("SLIME", 100, new int[] { 0, 0, 0, 0 }, 0); - - public final ArmorPart armorPart; - protected final String textureFolder; - protected final String textureName; - - public ItemSlimeBoots() { - super(SLIME_MATERIAL, 0, 3); - this.setCreativeTab(TConstructRegistry.gadgetsTab); - this.setMaxStackSize(1); - this.setMaxDamage(100); - SLIME_MATERIAL.customCraftingMaterial = Items.slime_ball; - armorPart = ArmorPart.Feet; - textureFolder = "armor"; - textureName = "slime"; - SlimeBounceHandler.registerEvent(this); - } - - @Override - public boolean isValidArmor(ItemStack stack, int armorType1, Entity entity) { - // can be worn as boots - return armorType1 == 3; - } - - // equipping with rightclick - @Override - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { - int slot = 1; // 0 = current item, 1 = feet - ItemStack itemstack = playerIn.getEquipmentInSlot(slot); - if (itemstack == null) { - playerIn.setCurrentItemOrArmor(slot, itemStackIn.copy()); - itemStackIn.stackSize--; - } - else { - itemstack = itemstack.copy(); - playerIn.setCurrentItemOrArmor(1, itemStackIn.copy()); - //playerIn.setCurrentItemOrArmor(0, itemstack); - playerIn.entityDropItem(itemstack, 0); - itemStackIn.stackSize--; - } - return itemStackIn; - } - - /** Called when an entity lands to handle the event */ - @SubscribeEvent - // RUBBERY BOUNCY BOUNCERY WOOOOO - public void onFall(LivingFallEvent event) { - EntityLivingBase living = event.entityLiving; - //TinkerGadgets.log.info("Fall event."); - // using fall distance as the event distance could be reduced by jump boost - if (living == null || living.fallDistance <= 2f) { - //TinkerGadgets.log.info("Invalid event."); - return; - } - // can the entity bounce? - if (!SlimeBounceHandler.hasSlimeBoots(living)) { - //TinkerGadgets.log.info("No Boots."); - return; - } - - // reduced fall damage when crouching - if (living.isSneaking()) { - //TinkerGadgets.log.info("Sneaking"); - event.distance = 1; - return; - } - - // thing is wearing slime boots. let's get bouncyyyyy - event.setCanceled(true); - // skip further client processing on players - if (living.worldObj.isRemote) { - //TinkerGadgets.log.info("Client Fall Handler."); - living.playSound("mob.slime.small", 1f, 1f); - SlimeBounceHandler.addBounceHandler(living); - //TConstruct.packetPipeline.sendToServer(new BouncedPacket(living)); - return; - } - - // server players behave differently than non-server players, they have no - // velocity during the event, so we need to reverse engineer it - Vector3d motion = SlimeBounceHandler.getMotion(living); - if (living instanceof EntityPlayerMP) { - // velocity is lost on server players, but we dont have to defer the bounce - double gravity = 0.2353455252; - double time = Math.sqrt(living.fallDistance / gravity); - double velocity = gravity * time; - living.setVelocity(motion.x / 0.95f, velocity, motion.z / 0.95f); - living.velocityChanged = true; - // preserve momentum - SlimeBounceHandler.addBounceHandler(living); - //TinkerGadgets.log.info("Player"); - } - else { - // for non-players, need to defer the bounce - // only slow down half as much when bouncing - living.setVelocity(motion.x / 0.95f, motion.y * -0.9, motion.z / 0.95f); - SlimeBounceHandler.addBounceHandler(living, SlimeBounceHandler.getMotion(living).y); - //TinkerGadgets.log.info("Not Player"); - } - //TinkerGadgets.log.info("Server Fall Handler."); - // update airborn status - living.isAirBorne = true; - living.onGround = false; - event.distance = 0f; - living.playSound("mob.slime.small", 1f, 1f); - } - - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - return 2; - } - - @Override - @SideOnly(Side.CLIENT) - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "tinker:textures/armor/" + textureName + "_" + 1 + ".png"; - } - - @SideOnly(Side.CLIENT) - protected IIcon[] modifiers; - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_boots"); - - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int renderPass) { - return itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack par1ItemStack) { - return false; - } - - // ISpecialArmor overrides - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, - int slot) { - return new ArmorProperties(0, armor.getItemDamage() / 100, 100); - } - - @Override - public void damageArmor(EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot) { - if (source == DamageSource.fall) { - return; - } - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1)); - } - - // Vanilla overrides - @Override - public boolean isItemTool(ItemStack par1ItemStack) { - return false; - } - - @Override - public boolean isRepairable() { - return true; - } - - @Override - public int getItemEnchantability() { - return 0; - } - - @Override - public boolean isFull3D() { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Boooounce!"); - list.add("Hold "+(I18n.format(Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription(), new Object[0]))+" to stop bouncing."); - } - - /* Prevent armor from dying */ - @Override - public boolean hasCustomEntity(ItemStack stack) { - return true; - } - - @Override - public Entity createEntity(World world, Entity location, ItemStack itemstack) { - return new FancyEntityItem(world, location, itemstack); - } + public static ArmorMaterial SLIME_MATERIAL = EnumHelper.addArmorMaterial("SLIME", 100, new int[] {0, 0, 0, 0}, 0); + + public final ArmorPart armorPart; + protected final String textureFolder; + protected final String textureName; + + public ItemSlimeBoots() { + super(SLIME_MATERIAL, 0, 3); + this.setCreativeTab(TConstructRegistry.gadgetsTab); + this.setMaxStackSize(1); + this.setMaxDamage(100); + SLIME_MATERIAL.customCraftingMaterial = Items.slime_ball; + armorPart = ArmorPart.Feet; + textureFolder = "armor"; + textureName = "slime"; + SlimeBounceHandler.registerEvent(this); + } + + @Override + public boolean isValidArmor(ItemStack stack, int armorType1, Entity entity) { + // can be worn as boots + return armorType1 == 3; + } + + // equipping with rightclick + @Override + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { + int slot = 1; // 0 = current item, 1 = feet + ItemStack itemstack = playerIn.getEquipmentInSlot(slot); + if (itemstack == null) { + playerIn.setCurrentItemOrArmor(slot, itemStackIn.copy()); + itemStackIn.stackSize--; + } else { + itemstack = itemstack.copy(); + playerIn.setCurrentItemOrArmor(1, itemStackIn.copy()); + // playerIn.setCurrentItemOrArmor(0, itemstack); + playerIn.entityDropItem(itemstack, 0); + itemStackIn.stackSize--; + } + return itemStackIn; + } + + /** Called when an entity lands to handle the event */ + @SubscribeEvent + // RUBBERY BOUNCY BOUNCERY WOOOOO + public void onFall(LivingFallEvent event) { + EntityLivingBase living = event.entityLiving; + // TinkerGadgets.log.info("Fall event."); + // using fall distance as the event distance could be reduced by jump boost + if (living == null || living.fallDistance <= 2f) { + // TinkerGadgets.log.info("Invalid event."); + return; + } + // can the entity bounce? + if (!SlimeBounceHandler.hasSlimeBoots(living)) { + // TinkerGadgets.log.info("No Boots."); + return; + } + + // reduced fall damage when crouching + if (living.isSneaking()) { + // TinkerGadgets.log.info("Sneaking"); + event.distance = 1; + return; + } + + // thing is wearing slime boots. let's get bouncyyyyy + event.setCanceled(true); + // skip further client processing on players + if (living.worldObj.isRemote) { + // TinkerGadgets.log.info("Client Fall Handler."); + living.playSound("mob.slime.small", 1f, 1f); + SlimeBounceHandler.addBounceHandler(living); + // TConstruct.packetPipeline.sendToServer(new BouncedPacket(living)); + return; + } + + // server players behave differently than non-server players, they have no + // velocity during the event, so we need to reverse engineer it + Vector3d motion = SlimeBounceHandler.getMotion(living); + if (living instanceof EntityPlayerMP) { + // velocity is lost on server players, but we dont have to defer the bounce + double gravity = 0.2353455252; + double time = Math.sqrt(living.fallDistance / gravity); + double velocity = gravity * time; + living.setVelocity(motion.x / 0.95f, velocity, motion.z / 0.95f); + living.velocityChanged = true; + // preserve momentum + SlimeBounceHandler.addBounceHandler(living); + // TinkerGadgets.log.info("Player"); + } else { + // for non-players, need to defer the bounce + // only slow down half as much when bouncing + living.setVelocity(motion.x / 0.95f, motion.y * -0.9, motion.z / 0.95f); + SlimeBounceHandler.addBounceHandler(living, SlimeBounceHandler.getMotion(living).y); + // TinkerGadgets.log.info("Not Player"); + } + // TinkerGadgets.log.info("Server Fall Handler."); + // update airborn status + living.isAirBorne = true; + living.onGround = false; + event.distance = 0f; + living.playSound("mob.slime.small", 1f, 1f); + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + return 2; + } + + @Override + @SideOnly(Side.CLIENT) + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return "tinker:textures/armor/" + textureName + "_" + 1 + ".png"; + } + + @SideOnly(Side.CLIENT) + protected IIcon[] modifiers; + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_boots"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int renderPass) { + return itemIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack par1ItemStack) { + return false; + } + + // ISpecialArmor overrides + @Override + public ArmorProperties getProperties( + EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + return new ArmorProperties(0, armor.getItemDamage() / 100, 100); + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot) { + if (source == DamageSource.fall) { + return; + } + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + par3List.add(new ItemStack(par1)); + } + + // Vanilla overrides + @Override + public boolean isItemTool(ItemStack par1ItemStack) { + return false; + } + + @Override + public boolean isRepairable() { + return true; + } + + @Override + public int getItemEnchantability() { + return 0; + } + + @Override + public boolean isFull3D() { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add("Boooounce!"); + list.add("Hold " + + (I18n.format( + Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription(), new Object[0])) + + " to stop bouncing."); + } + + /* Prevent armor from dying */ + @Override + public boolean hasCustomEntity(ItemStack stack) { + return true; + } + + @Override + public Entity createEntity(World world, Entity location, ItemStack itemstack) { + return new FancyEntityItem(world, location, itemstack); + } } diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java index ec336200385..336de0f6e37 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java @@ -1,10 +1,8 @@ package tconstruct.gadgets.item; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -24,85 +22,85 @@ public class ItemSlimeSling extends Item { - public ItemSlimeSling() { - this.setMaxStackSize(1); - this.setCreativeTab(TConstructRegistry.gadgetsTab); - } - - /** - * Called whenever this item is equipped and the right mouse button is pressed. - * Args: itemStack, world, entityPlayer - */ - @Override - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { - playerIn.setItemInUse(itemStackIn, this.getMaxItemUseDuration(itemStackIn)); - return itemStackIn; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - return this.itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("tinker:gadgets/slimesling"); - } - - @Override - public EnumAction getItemUseAction(ItemStack stack) { - return EnumAction.bow; - } - - @Override - public int getMaxItemUseDuration(ItemStack stack) { - return 72000; - } - - // sling logic - @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int timeLeft) { - // has to be on ground to do something - if (!player.onGround) { - return; - } - - // copy chargeup code from bow \o/ - int i = this.getMaxItemUseDuration(stack) - timeLeft; - float f = i / 20.0F; - f = (f * f + f * 2.0F) / 3.0F; - f *= 4f; - - if (f > 6f) { - f = 6f; - } - - // check if player was targeting a block - MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, false); - - if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - // we fling the inverted player look vector - Vec3 vec = player.getLookVec().normalize(); - - player.addVelocity(vec.xCoord * -f, vec.yCoord * -f / 3f, vec.zCoord * -f); - - if (player instanceof EntityPlayerMP) { - EntityPlayerMP playerMP = (EntityPlayerMP) player; - TConstruct.packetPipeline.sendTo(new MovementUpdatePacket(player), playerMP); - playerMP.playerNetServerHandler.sendPacket(new S12PacketEntityVelocity(player)); - } - player.playSound(TinkerGadgets.resource("slimesling"), 1f, 1f); - SlimeBounceHandler.addBounceHandler(player); - // TinkerCommons.potionSlimeBounce.apply(player); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add("Aim at a block behind you to get thrown into the air."); - list.add(player.onGround ? "Shoot for the moon!" : "Must be on the ground to use."); - } + public ItemSlimeSling() { + this.setMaxStackSize(1); + this.setCreativeTab(TConstructRegistry.gadgetsTab); + } + + /** + * Called whenever this item is equipped and the right mouse button is pressed. + * Args: itemStack, world, entityPlayer + */ + @Override + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { + playerIn.setItemInUse(itemStackIn, this.getMaxItemUseDuration(itemStackIn)); + return itemStackIn; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + return this.itemIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("tinker:gadgets/slimesling"); + } + + @Override + public EnumAction getItemUseAction(ItemStack stack) { + return EnumAction.bow; + } + + @Override + public int getMaxItemUseDuration(ItemStack stack) { + return 72000; + } + + // sling logic + @Override + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int timeLeft) { + // has to be on ground to do something + if (!player.onGround) { + return; + } + + // copy chargeup code from bow \o/ + int i = this.getMaxItemUseDuration(stack) - timeLeft; + float f = i / 20.0F; + f = (f * f + f * 2.0F) / 3.0F; + f *= 4f; + + if (f > 6f) { + f = 6f; + } + + // check if player was targeting a block + MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, false); + + if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + // we fling the inverted player look vector + Vec3 vec = player.getLookVec().normalize(); + + player.addVelocity(vec.xCoord * -f, vec.yCoord * -f / 3f, vec.zCoord * -f); + + if (player instanceof EntityPlayerMP) { + EntityPlayerMP playerMP = (EntityPlayerMP) player; + TConstruct.packetPipeline.sendTo(new MovementUpdatePacket(player), playerMP); + playerMP.playerNetServerHandler.sendPacket(new S12PacketEntityVelocity(player)); + } + player.playSound(TinkerGadgets.resource("slimesling"), 1f, 1f); + SlimeBounceHandler.addBounceHandler(player); + // TinkerCommons.potionSlimeBounce.apply(player); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add("Aim at a block behind you to get thrown into the air."); + list.add(player.onGround ? "Shoot for the moon!" : "Must be on the ground to use."); + } } diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 8b776c25f32..d2f00a6d71e 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -16,11 +16,9 @@ import tconstruct.weaponry.TinkerWeaponry; @Deprecated -public class Arrow extends ToolCore -{ +public class Arrow extends ToolCore { - public Arrow() - { + public Arrow() { super(3); this.setUnlocalizedName("InfiTool.Arrow"); this.setMaxStackSize(64); @@ -28,95 +26,87 @@ public Arrow() } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_arrow_head"; - case 1: - return ""; // Doesn't break - case 2: - return "_arrow_shaft"; - case 3: - return "_arrow_fletching"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_arrow_head"; + case 1: + return ""; // Doesn't break + case 2: + return "_arrow_shaft"; + case 3: + return "_arrow_fletching"; + default: + return ""; } } @Override protected int getDefaultColor(int renderPass, int materialID) { // fletchling uses custom material - if(renderPass == 2) { + if (renderPass == 2) { CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class); - if(mat != null) - return mat.color; + if (mat != null) return mat.color; } return super.getDefaultColor(renderPass, materialID); } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_arrow_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "arrow"; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); handleStrings.put(index, location[2]); } @Override - public void registerAlternatePartPaths (int index, String[] location) - { + public void registerAlternatePartPaths(int index, String[] location) { accessoryStrings.put(index, location[3]); } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerWeaponry.arrowhead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerWeaponry.fletching; } @Override - public String[] getTraits () - { - return new String[] { "ammo" }; + public String[] getTraits() { + return new String[] {"ammo"}; } @Override - public float getDamageModifier () - { + public float getDamageModifier() { return 0.5f; } @Override - public void getSubItems (Item id, CreativeTabs tab, List list) - { + public void getSubItems(Item id, CreativeTabs tab, List list) { // Vanilla style arrow Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, 0) : null; Item extra = getExtraItem(); ItemStack extraStack = extra != null ? new ItemStack(extra, 1, 0) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, ""); - if (tool != null) - { + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, 3), + new ItemStack(getHandleItem(), 1, 0), + accessoryStack, + extraStack, + ""); + if (tool != null) { tool.stackSize = 1; tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); @@ -127,10 +117,14 @@ public void getSubItems (Item id, CreativeTabs tab, List list) accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, random.nextInt(4)) : null; extra = getExtraItem(); extraStack = extra != null ? new ItemStack(extra, 1, 0) : null; - tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, random.nextInt(18)), new ItemStack(getHandleItem(), 1, random.nextInt(18)), accessoryStack, extraStack, StatCollector.translateToLocal("item.tool.randomarrow")); - - if (tool != null) - { + tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, random.nextInt(18)), + new ItemStack(getHandleItem(), 1, random.nextInt(18)), + accessoryStack, + extraStack, + StatCollector.translateToLocal("item.tool.randomarrow")); + + if (tool != null) { tool.stackSize = 1; tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); @@ -139,15 +133,18 @@ public void getSubItems (Item id, CreativeTabs tab, List list) } @Override - public void buildTool (int id, String name, List list) - { + public void buildTool(int id, String name, List list) { Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, 0) : null; Item extra = getExtraItem(); ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name); - if (tool != null) - { + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, id), + new ItemStack(getHandleItem(), 1, id), + accessoryStack, + extraStack, + name); + if (tool != null) { tool.stackSize = 1; tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); @@ -155,76 +152,75 @@ public void buildTool (int id, String name, List list) } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { return false; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("Energy")) - { + if (tags.hasKey("Energy")) { String color = ""; // double joules = this.getJoules(stack); int power = tags.getInteger("Energy"); - if (power != 0) - { - if (power <= this.getMaxEnergyStored(stack) / 3) - color = "\u00a74"; - else if (power > this.getMaxEnergyStored(stack) * 2 / 3) - color = "\u00a72"; - else - color = "\u00a76"; + if (power != 0) { + if (power <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; + else color = "\u00a76"; } - String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + String energy = new StringBuilder() + .append(color) + .append(tags.getInteger("Energy")) + .append("/") + .append(getMaxEnergyStored(stack)) + .append(" RF") + .toString(); list.add(energy); } - if (tags.hasKey("InfiTool")) - { + if (tags.hasKey("InfiTool")) { boolean broken = tags.getCompoundTag("InfiTool").getBoolean("Broken"); - if (broken) - list.add("\u00A7oBroken"); - else - { + if (broken) list.add("\u00A7oBroken"); + else { int head = tags.getCompoundTag("InfiTool").getInteger("Head"); int handle = tags.getCompoundTag("InfiTool").getInteger("Handle"); String headName = getAbilityNameForType(head, 0); - if (!headName.equals("")) - list.add(getStyleForType(head) + headName); + if (!headName.equals("")) list.add(getStyleForType(head) + headName); String handleName = getAbilityNameForType(handle, 0); - if (!handleName.equals("") && handle != head) - list.add(getStyleForType(handle) + handleName); + if (!handleName.equals("") && handle != head) list.add(getStyleForType(handle) + handleName); boolean displayToolTips = true; int tipNum = 0; - while (displayToolTips) - { + while (displayToolTips) { tipNum++; String tooltip = "Tooltip" + tipNum; - if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) - { + if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) { String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); - if (!tipName.equals("")) - list.add(tipName); - } - else - displayToolTips = false; + if (!tipName.equals("")) list.add(tipName); + } else displayToolTips = false; } } } int attack = (int) (tags.getCompoundTag("InfiTool").getInteger("Attack") * this.getDamageModifier()); - list.add("\u00A79+" + attack + " " + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); - list.add("\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + " " + StatCollector.translateToLocalFormatted("attribute.name.ammo.attackDamage")); + list.add("\u00A79+" + attack + " " + + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); + list.add("\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + " " + + StatCollector.translateToLocalFormatted("attribute.name.ammo.attackDamage")); } - } diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index 1c829c2247c..873a894be70 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -10,122 +10,105 @@ import tconstruct.tools.*; import tconstruct.tools.logic.EquipLogic; -public class BattleSign extends Weapon -{ - public BattleSign() - { +public class BattleSign extends Weapon { + public BattleSign() { super(1); this.setUnlocalizedName("InfiTool.Battlesign"); } @Override - public String getToolName () - { + public String getToolName() { return "Battlesign"; } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.signHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return null; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 2; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_battlesign_head"; - case 1: - return "_battlesign_head_broken"; - case 2: - return "_battlesign_handle"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_battlesign_head"; + case 1: + return "_battlesign_head_broken"; + case 2: + return "_battlesign_handle"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_battlesign_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "battlesign"; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { - if (side == 0 || !player.isSneaking()) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { + if (side == 0 || !player.isSneaking()) { return false; - } - else if (!world.getBlock(x, y, z).getMaterial().isSolid()) - { + } else if (!world.getBlock(x, y, z).getMaterial().isSolid()) { return false; - } - else - { - if (side == 1) - { + } else { + if (side == 1) { ++y; } - if (side == 2) - { + if (side == 2) { --z; } - if (side == 3) - { + if (side == 3) { ++z; } - if (side == 4) - { + if (side == 4) { --x; } - if (side == 5) - { + if (side == 5) { ++x; } - if (!player.canPlayerEdit(x, y, z, side, stack)) - { + if (!player.canPlayerEdit(x, y, z, side, stack)) { return false; - } - else if (!TinkerTools.battlesignBlock.canPlaceBlockAt(world, x, y, z)) - { + } else if (!TinkerTools.battlesignBlock.canPlaceBlockAt(world, x, y, z)) { return false; - } - else - { + } else { world.setBlock(x, y, z, TinkerTools.battlesignBlock, 0, 3); TinkerTools.battlesignBlock.onBlockPlacedBy(world, x, y, z, player, stack); @@ -133,8 +116,7 @@ else if (!TinkerTools.battlesignBlock.canPlaceBlockAt(world, x, y, z)) logic.setEquipmentItem(stack); --stack.stackSize; - if (FMLCommonHandler.instance().getSide() == Side.CLIENT) - { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { player.openGui(TConstruct.instance, ToolProxyClient.battlesignTextID, world, x, y, z); } diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index fed3c85d88b..462f8bdc1cd 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -1,5 +1,8 @@ package tconstruct.items.tools; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; import net.minecraft.block.Block; @@ -19,152 +22,139 @@ import tconstruct.library.tools.AOEHarvestTool; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -@Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), - @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword") }) -public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon -{ - public Battleaxe() - { +@Optional.InterfaceList({ + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), + @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword") +}) +public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { + public Battleaxe() { super(4, 1, 1); this.setUnlocalizedName("InfiTool.Battleaxe"); } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "axe"; } @Override - public boolean onBlockDestroyed (ItemStack itemstack, World world, Block b, int x, int y, int z, EntityLivingBase player) - { - if (b != null && b.getMaterial() == Material.leaves) - return false; + public boolean onBlockDestroyed( + ItemStack itemstack, World world, Block b, int x, int y, int z, EntityLivingBase player) { + if (b != null && b.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, b, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd }; + static Material[] materials = {Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd}; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.broadAxeHead; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toughRod; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.broadAxeHead; } @Override - public Item getExtraItem () - { + public Item getExtraItem() { return TinkerTools.toughBinding; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } @Override - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 1; } @Override - public float getRepairCost () - { + public float getRepairCost() { return 4.0f; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 2.5f; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 4; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_battleaxe_fronthead"; - case 1: - return "_battleaxe_fronthead_broken"; - case 2: - return "_battleaxe_handle"; - case 3: - return "_battleaxe_backhead"; - case 4: - return "_battleaxe_binding"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_battleaxe_fronthead"; + case 1: + return "_battleaxe_fronthead_broken"; + case 2: + return "_battleaxe_handle"; + case 3: + return "_battleaxe_backhead"; + case 4: + return "_battleaxe_binding"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_battleaxe_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "battleaxe"; } @Override - public String[] getTraits () - { - return new String[] { "weapon", "harvest", "melee", "slicing" }; + public String[] getTraits() { + return new String[] {"weapon", "harvest", "melee", "slicing"}; } /* Battleaxe Specific */ @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { return false; } @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.bow; } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { // player.rotationYaw += 1; // if (player.onGround) // { @@ -174,66 +164,59 @@ public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer pl } @Override - public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int useCount) - { + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int useCount) { // if (player.onGround) { int time = this.getMaxItemUseDuration(stack) - useCount; int boost = time / 100; - if (boost > 2) - boost = 2; + if (boost > 2) boost = 2; - if (!world.isRemote) - { + if (!world.isRemote) { player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, time * 4, boost)); player.addPotionEffect(new PotionEffect(Potion.jump.id, time * 4, boost)); player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, time * 4, 0)); player.addPotionEffect(new PotionEffect(Potion.hunger.id, time * 2, 0)); } - if (time > 5 && player.onGround) - { + if (time > 5 && player.onGround) { player.addExhaustion(0.2F); player.setSprinting(true); float speed = 0.025F * time; - if (speed > 0.925f) - speed = 0.925f; + if (speed > 0.925f) speed = 0.925f; float increase = (float) (0.02 * time + 0.2); - if (increase > 0.56f) - increase = 0.56f; + if (increase > 0.56f) increase = 0.56f; player.motionY += increase; - player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * speed); - player.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * speed); + player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) + * speed); + player.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) + * speed); } } } @Override - public int getMaxItemUseDuration (ItemStack par1ItemStack) - { + public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 72000; } @Override - public boolean hitEntity (ItemStack stack, EntityLivingBase mob, EntityLivingBase player) - { + public boolean hitEntity(ItemStack stack, EntityLivingBase mob, EntityLivingBase player) { AbilityHelper.knockbackEntity(mob, 1.5f); return true; } @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 5.0F; player.movementInput.moveStrafe *= 5.0F; } @@ -244,54 +227,49 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo @Override @Optional.Method(modid = "battlegear2") - public boolean sheatheOnBack (ItemStack item) - { + public boolean sheatheOnBack(ItemStack item) { return true; } @Override @Optional.Method(modid = "battlegear2") - public boolean isOffhandHandDual (ItemStack off) - { + public boolean isOffhandHandDual(ItemStack off) { return true; } @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity (PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) - { + public boolean offhandAttackEntity( + PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { return true; } @Override @Optional.Method(modid = "battlegear2") - public boolean offhandClickAir (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) - { + public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) { return true; } @Override @Optional.Method(modid = "battlegear2") - public boolean offhandClickBlock (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) - { + public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) { return true; } @Override @Optional.Method(modid = "battlegear2") - public void performPassiveEffects (Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem) - { + public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem) { // unused } @Override @Optional.Method(modid = "battlegear2") - public boolean allowOffhand (ItemStack mainhand, ItemStack offhand) - { - if (offhand == null) - return true; + public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { + if (offhand == null) return true; - return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null + && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 456d2966390..abd5b375cd5 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -20,81 +20,68 @@ import tconstruct.util.config.PHConstruct; @Deprecated -public abstract class BowBase extends ToolCore -{ - public BowBase() - { +public abstract class BowBase extends ToolCore { + public BowBase() { super(0); } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } /* Bow usage */ @Override - public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int useRemaining) - { + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int useRemaining) { int time = this.getMaxItemUseDuration(stack) - useRemaining; ArrowLooseEvent event = new ArrowLooseEvent(player, stack, time); MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - { + if (event.isCanceled()) { return; } time = event.charge; - boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; + boolean creative = player.capabilities.isCreativeMode + || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; int slotID = getInventorySlotContainItem(TinkerTools.arrow, player.inventory); int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory); int arrowState = 0; ItemStack tinkerArrow = null; - if (slotID != -1) - tinkerArrow = player.inventory.getStackInSlot(slotID); + if (slotID != -1) tinkerArrow = player.inventory.getStackInSlot(slotID); - if (creative || tinkerArrow != null || arrowID != -1) - { + if (creative || tinkerArrow != null || arrowID != -1) { NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); float drawTime = toolTag.getInteger("DrawSpeed"); float flightSpeed = toolTag.getFloat("FlightSpeed"); float speedBase = (float) time / drawTime; speedBase = (speedBase * speedBase + speedBase * 2.0F) / 3.0F; - if ((double) speedBase < 0.1D) - { + if ((double) speedBase < 0.1D) { return; } - if (speedBase > flightSpeed) - { + if (speedBase > flightSpeed) { speedBase = flightSpeed; } EntityArrow arrowEntity = null; // if (tinkerArrow != null) - if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) - { + if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) { ItemStack arrowStack = tinkerArrow.copy(); arrowStack.stackSize = 1; arrowEntity = new ArrowEntity(world, player, speedBase * 2.0F, arrowStack); - } - else - { + } else { arrowEntity = new EntityArrow(world, player, speedBase * 2.0F); } - if (speedBase >= 1.0F) - { + if (speedBase >= 1.0F) { arrowEntity.setIsCritical(true); } int var9 = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack); - if (var9 > 0) - { + if (var9 > 0) { arrowEntity.setDamage(arrowEntity.getDamage() + (double) var9 * 0.5D + 0.5D); } @@ -104,57 +91,44 @@ public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer pla ((ArrowEntity) arrowEntity).setKnockbackModStrength(toolTag.getFloat("Knockback")); // var10 += toolTag.getFloat("Knockback"); - if (var10 > 0) - { + if (var10 > 0) { arrowEntity.setKnockbackStrength(var10); } - if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) - { + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) { arrowEntity.setFire(100); } int reinforced = 0; - if (toolTag.hasKey("Unbreaking")) - reinforced = toolTag.getInteger("Unbreaking"); + if (toolTag.hasKey("Unbreaking")) reinforced = toolTag.getInteger("Unbreaking"); - if (random.nextInt(10) < 10 - reinforced) - { + if (random.nextInt(10) < 10 - reinforced) { AbilityHelper.damageTool(stack, 1, player, false); } - world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); + world.playSoundAtEntity( + player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); - if (creative) - { + if (creative) { arrowEntity.canBePickedUp = 2; - } - else - { + } else { // if (tinkerArrow != null) - if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) - { + if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) { player.inventory.consumeInventoryItem(TinkerTools.arrow); - } - else - { + } else { player.inventory.consumeInventoryItem(Items.arrow); } } - if (!world.isRemote) - { + if (!world.isRemote) { world.spawnEntityInWorld(arrowEntity); } } } - int getInventorySlotContainItem (Item item, InventoryPlayer inventory) - { - for (int j = 0; j < inventory.mainInventory.length; ++j) - { - if (inventory.mainInventory[j] != null && inventory.mainInventory[j].getItem() == item) - { + int getInventorySlotContainItem(Item item, InventoryPlayer inventory) { + for (int j = 0; j < inventory.mainInventory.length; ++j) { + if (inventory.mainInventory[j] != null && inventory.mainInventory[j].getItem() == item) { return j; } } @@ -162,8 +136,7 @@ int getInventorySlotContainItem (Item item, InventoryPlayer inventory) return -1; } - public ItemStack onFoodEaten (ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) - { + public ItemStack onFoodEaten(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) { return stack; } @@ -171,8 +144,7 @@ public ItemStack onFoodEaten (ItemStack stack, World par2World, EntityPlayer par * How long it takes to use or consume an item */ @Override - public int getMaxItemUseDuration (ItemStack par1ItemStack) - { + public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 72000; } @@ -181,8 +153,7 @@ public int getMaxItemUseDuration (ItemStack par1ItemStack) * is being used */ @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.bow; } @@ -191,22 +162,19 @@ public EnumAction getItemUseAction (ItemStack par1ItemStack) * pressed. Args: itemStack, world, entityPlayer */ @Override - public ItemStack onItemRightClick (ItemStack stack, World par2World, EntityPlayer player) - { - if (stack.hasTagCompound()) - { + public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer player) { + if (stack.hasTagCompound()) { NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); - if (!toolTag.getBoolean("Broken")) - { + if (!toolTag.getBoolean("Broken")) { ArrowNockEvent event = new ArrowNockEvent(player, stack); MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - { + if (event.isCanceled()) { return event.result; } - if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow))) - { + if (player.capabilities.isCreativeMode + || player.inventory.hasItemStack(new ItemStack(Items.arrow)) + || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow))) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } } @@ -217,45 +185,50 @@ public ItemStack onItemRightClick (ItemStack stack, World par2World, EntityPlaye /* Rendering */ @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); - if(PHConstruct.minimalTextures) - { + if (PHConstruct.minimalTextures) { headIcons1.clear(); - headIcons1.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_1")); + headIcons1.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_1")); handleIcons1.clear(); - handleIcons1.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_1")); + handleIcons1.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_1")); accessoryIcons1.clear(); - accessoryIcons1.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_1")); + accessoryIcons1.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_1")); headIcons2.clear(); - headIcons2.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_2")); + headIcons2.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_2")); handleIcons2.clear(); - handleIcons2.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_2")); + handleIcons2.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_2")); accessoryIcons2.clear(); - accessoryIcons2.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_2")); + accessoryIcons2.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_2")); headIcons3.clear(); - headIcons3.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_3")); + headIcons3.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_3")); handleIcons3.clear(); - handleIcons3.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_3")); + handleIcons3.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_3")); accessoryIcons3.clear(); - accessoryIcons3.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_3")); - + accessoryIcons3.put( + -1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_3")); // effect icons effectIcons1.clear(); effectIcons2.clear(); effectIcons3.clear(); - for(Map.Entry entry : effectStrings.entrySet()) { + for (Map.Entry entry : effectStrings.entrySet()) { effectIcons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue())); effectIcons1.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_1")); effectIcons2.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_2")); effectIcons3.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_3")); } - } - else { + } else { headIcons1.clear(); handleIcons1.clear(); accessoryIcons1.clear(); @@ -277,7 +250,8 @@ public void registerIcons (IIconRegister iconRegister) iterOne = accessoryStrings.entrySet().iterator(); while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - accessoryIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + accessoryIcons1.put( + (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } } @@ -285,7 +259,8 @@ public void registerIcons (IIconRegister iconRegister) iterOne = extraStrings.entrySet().iterator(); while (iterOne.hasNext()) { Map.Entry pairs = (Map.Entry) iterOne.next(); - extraIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + extraIcons1.put( + (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); } } @@ -316,7 +291,8 @@ public void registerIcons (IIconRegister iconRegister) iterTwo = accessoryStrings.entrySet().iterator(); while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - accessoryIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + accessoryIcons2.put( + (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } } @@ -324,7 +300,8 @@ public void registerIcons (IIconRegister iconRegister) iterTwo = extraStrings.entrySet().iterator(); while (iterTwo.hasNext()) { Map.Entry pairs = (Map.Entry) iterTwo.next(); - extraIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + extraIcons2.put( + (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); } } @@ -355,7 +332,8 @@ public void registerIcons (IIconRegister iconRegister) iterThree = accessoryStrings.entrySet().iterator(); while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - accessoryIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + accessoryIcons3.put( + (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } } @@ -363,7 +341,8 @@ public void registerIcons (IIconRegister iconRegister) iterThree = extraStrings.entrySet().iterator(); while (iterThree.hasNext()) { Map.Entry pairs = (Map.Entry) iterThree.next(); - extraIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + extraIcons3.put( + (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); } } @@ -376,82 +355,46 @@ public void registerIcons (IIconRegister iconRegister) registerArrows(iconRegister); } - void registerArrows (IIconRegister iconRegister) - { + void registerArrows(IIconRegister iconRegister) { arrow1 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_1"); arrow2 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_2"); arrow3 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_3"); } @Override - public IIcon getIcon (ItemStack stack, int renderPass) - { + public IIcon getIcon(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { + if (renderPass < getPartAmount()) { if (renderPass == 0) // Handle { - if (tags.getBoolean("Broken")) - return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle")); + if (tags.getBoolean("Broken")) return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle")); return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle")); - } - - else if (renderPass == 1) // Head + } else if (renderPass == 1) // Head { return getCorrectIcon(headIcons, tags.getInteger("RenderHead")); - } - - else if (renderPass == 2) // Accessory + } else if (renderPass == 2) // Accessory { return getCorrectIcon(accessoryIcons, tags.getInteger("RenderAccessory")); - } - - else if (renderPass == 3) // Extra + } else if (renderPass == 3) // Extra { return getCorrectIcon(extraIcons, tags.getInteger("RenderExtra")); } - } - - else - { - if (renderPass == getPartAmount()) - { - if (tags.hasKey("Effect1")) - return getCorrectIcon2(effectIcons, tags.getInteger("Effect1")); - } - - else if (renderPass == getPartAmount() + 1) - { - if (tags.hasKey("Effect2")) - return getCorrectIcon2(effectIcons, tags.getInteger("Effect2")); - } - - else if (renderPass == getPartAmount() + 2) - { - if (tags.hasKey("Effect3")) - return getCorrectIcon2(effectIcons, tags.getInteger("Effect3")); - } - - else if (renderPass == getPartAmount() + 3) - { - if (tags.hasKey("Effect4")) - return getCorrectIcon2(effectIcons, tags.getInteger("Effect4")); - } - - else if (renderPass == getPartAmount() + 4) - { - if (tags.hasKey("Effect5")) - return getCorrectIcon2(effectIcons, tags.getInteger("Effect5")); - } - - else if (renderPass == getPartAmount() + 5) - { - if (tags.hasKey("Effect6")) - return getCorrectIcon2(effectIcons, tags.getInteger("Effect6")); + } else { + if (renderPass == getPartAmount()) { + if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect1")); + } else if (renderPass == getPartAmount() + 1) { + if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect2")); + } else if (renderPass == getPartAmount() + 2) { + if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect3")); + } else if (renderPass == getPartAmount() + 3) { + if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect4")); + } else if (renderPass == getPartAmount() + 4) { + if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect5")); + } else if (renderPass == getPartAmount() + 5) { + if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect6")); } } return blankSprite; @@ -459,30 +402,24 @@ else if (renderPass == getPartAmount() + 5) return emptyIcon; } - protected IIcon getCorrectIcon2(Map icons, int id) - { - if(!icons.containsKey(id)) - return blankSprite; - + protected IIcon getCorrectIcon2(Map icons, int id) { + if (!icons.containsKey(id)) return blankSprite; + return icons.get(id); } /* Animations */ @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); // brokenHeadStrings.put(index, location[1]); // handleStrings.put(index, location[2]); - if (location.length > 3) - accessoryStrings.put(index, location[3]); - if (location.length > 4) - extraStrings.put(index, location[4]); + if (location.length > 3) accessoryStrings.put(index, location[3]); + if (location.length > 4) extraStrings.put(index, location[4]); } @Override - public void registerAlternatePartPaths (int index, String[] location) - { + public void registerAlternatePartPaths(int index, String[] location) { brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } @@ -510,100 +447,59 @@ public void registerAlternatePartPaths (int index, String[] location) public HashMap effectIcons3 = new HashMap(); @Override - public IIcon getIcon (ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { int useTime = stack.getMaxItemUseDuration() - useRemaining; - if (!stack.hasTagCompound()) - return emptyIcon; + if (!stack.hasTagCompound()) return emptyIcon; NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); int drawTime = toolTag.getInteger("DrawSpeed"); float flightSpeed = toolTag.getFloat("FlightSpeed"); drawTime *= flightSpeed; - if (usingItem == null) - { + if (usingItem == null) { return getIcon(stack, renderPass); } - if (useTime >= drawTime - 2) - { + if (useTime >= drawTime - 2) { return getIcon3(stack, renderPass); } - if (useTime >= (drawTime * 2 / 3)) - { + if (useTime >= (drawTime * 2 / 3)) { return getIcon2(stack, renderPass); } return getIcon1(stack, renderPass); } - public IIcon getIcon1 (ItemStack stack, int renderPass) - { + public IIcon getIcon1(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { + if (renderPass < getPartAmount()) { if (renderPass == 0) // Handle { return getCorrectIcon(handleIcons1, tags.getInteger("RenderHandle")); - } - - else if (renderPass == 1) // Head + } else if (renderPass == 1) // Head { return getCorrectIcon(headIcons1, tags.getInteger("RenderHead")); - } - - else if (renderPass == 2) // Accessory + } else if (renderPass == 2) // Accessory { return getCorrectIcon(accessoryIcons1, tags.getInteger("RenderAccessory")); - } - - else if (renderPass == 3) // Extra + } else if (renderPass == 3) // Extra { return getCorrectIcon(extraIcons1, tags.getInteger("RenderExtra")); } - } - - else - { - if (renderPass == getPartAmount()) - { - if (tags.hasKey("Effect1")) - return getCorrectIcon2(effectIcons1, tags.getInteger("Effect1")); - } - - else if (renderPass == getPartAmount() + 1) - { - if (tags.hasKey("Effect2")) - return getCorrectIcon2(effectIcons1, tags.getInteger("Effect2")); - } - - else if (renderPass == getPartAmount() + 2) - { - if (tags.hasKey("Effect3")) - return getCorrectIcon2(effectIcons1, tags.getInteger("Effect3")); - } - - else if (renderPass == getPartAmount() + 3) - { - if (tags.hasKey("Effect4")) - return getCorrectIcon2(effectIcons1, tags.getInteger("Effect4")); - } - - else if (renderPass == getPartAmount() + 4) - { - if (tags.hasKey("Effect5")) - return getCorrectIcon2(effectIcons1, tags.getInteger("Effect5")); - } - - else if (renderPass == getPartAmount() + 5) - { - if (tags.hasKey("Effect6")) - return getCorrectIcon2(effectIcons1, tags.getInteger("Effect6")); - } - else - { + } else { + if (renderPass == getPartAmount()) { + if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect1")); + } else if (renderPass == getPartAmount() + 1) { + if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect2")); + } else if (renderPass == getPartAmount() + 2) { + if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect3")); + } else if (renderPass == getPartAmount() + 3) { + if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect4")); + } else if (renderPass == getPartAmount() + 4) { + if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect5")); + } else if (renderPass == getPartAmount() + 5) { + if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect6")); + } else { return arrow1; } } @@ -612,75 +508,39 @@ else if (renderPass == getPartAmount() + 5) return emptyIcon; } - public IIcon getIcon2 (ItemStack stack, int renderPass) - { + public IIcon getIcon2(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { + if (renderPass < getPartAmount()) { if (renderPass == 0) // Handle { return getCorrectIcon(handleIcons2, tags.getInteger("RenderHandle")); - } - - else if (renderPass == 1) // Head + } else if (renderPass == 1) // Head { return getCorrectIcon(headIcons2, tags.getInteger("RenderHead")); - } - - else if (renderPass == 2) // Accessory + } else if (renderPass == 2) // Accessory { return getCorrectIcon(accessoryIcons2, tags.getInteger("RenderAccessory")); - } - - else if (renderPass == 3) // Extra + } else if (renderPass == 3) // Extra { return getCorrectIcon(extraIcons2, tags.getInteger("RenderExtra")); } - } - - else - { - if (renderPass == getPartAmount()) - { - if (tags.hasKey("Effect1")) - return getCorrectIcon2(effectIcons2, tags.getInteger("Effect1")); - } - - else if (renderPass == getPartAmount() + 1) - { - if (tags.hasKey("Effect2")) - return getCorrectIcon2(effectIcons2, tags.getInteger("Effect2")); - } - - else if (renderPass == getPartAmount() + 2) - { - if (tags.hasKey("Effect3")) - return getCorrectIcon2(effectIcons2, tags.getInteger("Effect3")); - } - - else if (renderPass == getPartAmount() + 3) - { - if (tags.hasKey("Effect4")) - return getCorrectIcon2(effectIcons2, tags.getInteger("Effect4")); - } - - else if (renderPass == getPartAmount() + 4) - { - if (tags.hasKey("Effect5")) - return getCorrectIcon2(effectIcons2, tags.getInteger("Effect5")); - } - - else if (renderPass == getPartAmount() + 5) - { - if (tags.hasKey("Effect6")) - return getCorrectIcon2(effectIcons2, tags.getInteger("Effect6")); - } - else - { + } else { + if (renderPass == getPartAmount()) { + if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect1")); + } else if (renderPass == getPartAmount() + 1) { + if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect2")); + } else if (renderPass == getPartAmount() + 2) { + if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect3")); + } else if (renderPass == getPartAmount() + 3) { + if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect4")); + } else if (renderPass == getPartAmount() + 4) { + if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect5")); + } else if (renderPass == getPartAmount() + 5) { + if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect6")); + } else { return arrow2; } } @@ -689,75 +549,39 @@ else if (renderPass == getPartAmount() + 5) return emptyIcon; } - public IIcon getIcon3 (ItemStack stack, int renderPass) - { + public IIcon getIcon3(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { + if (renderPass < getPartAmount()) { if (renderPass == 0) // Handle { return getCorrectIcon(handleIcons3, tags.getInteger("RenderHandle")); - } - - else if (renderPass == 1) // Head + } else if (renderPass == 1) // Head { return getCorrectIcon(headIcons3, tags.getInteger("RenderHead")); - } - - else if (renderPass == 2) // Accessory + } else if (renderPass == 2) // Accessory { return getCorrectIcon(accessoryIcons3, tags.getInteger("RenderAccessory")); - } - - else if (renderPass == 3) // Extra + } else if (renderPass == 3) // Extra { return getCorrectIcon(extraIcons3, tags.getInteger("RenderExtra")); } - } - - else - { - if (renderPass == getPartAmount()) - { - if (tags.hasKey("Effect1")) - return getCorrectIcon2(effectIcons3, tags.getInteger("Effect1")); - } - - else if (renderPass == getPartAmount() + 1) - { - if (tags.hasKey("Effect2")) - return getCorrectIcon2(effectIcons3, tags.getInteger("Effect2")); - } - - else if (renderPass == getPartAmount() + 2) - { - if (tags.hasKey("Effect3")) - return getCorrectIcon2(effectIcons3, tags.getInteger("Effect3")); - } - - else if (renderPass == getPartAmount() + 3) - { - if (tags.hasKey("Effect4")) - return getCorrectIcon2(effectIcons3, tags.getInteger("Effect4")); - } - - else if (renderPass == getPartAmount() + 4) - { - if (tags.hasKey("Effect5")) - return getCorrectIcon2(effectIcons3, tags.getInteger("Effect5")); - } - - else if (renderPass == getPartAmount() + 5) - { - if (tags.hasKey("Effect6")) - return getCorrectIcon2(effectIcons3, tags.getInteger("Effect6")); - } - else - { + } else { + if (renderPass == getPartAmount()) { + if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect1")); + } else if (renderPass == getPartAmount() + 1) { + if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect2")); + } else if (renderPass == getPartAmount() + 2) { + if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect3")); + } else if (renderPass == getPartAmount() + 3) { + if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect4")); + } else if (renderPass == getPartAmount() + 4) { + if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect5")); + } else if (renderPass == getPartAmount() + 5) { + if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect6")); + } else { return arrow3; } } @@ -767,15 +591,18 @@ else if (renderPass == getPartAmount() + 5) } @Override - public void buildTool (int id, String name, List list) - { + public void buildTool(int id, String name, List list) { Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null; Item extra = getExtraItem(); ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name); - if (tool == null) - return; + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, id), + new ItemStack(getHandleItem(), 1, id), + accessoryStack, + extraStack, + name); + if (tool == null) return; tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); diff --git a/src/main/java/tconstruct/items/tools/Broadsword.java b/src/main/java/tconstruct/items/tools/Broadsword.java index 4cddea7a8c2..94e39f9dfb1 100644 --- a/src/main/java/tconstruct/items/tools/Broadsword.java +++ b/src/main/java/tconstruct/items/tools/Broadsword.java @@ -4,65 +4,56 @@ import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -public class Broadsword extends Weapon -{ - public Broadsword() - { +public class Broadsword extends Weapon { + public Broadsword() { super(4); this.setUnlocalizedName("InfiTool.Broadsword"); } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.swordBlade; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.wideGuard; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 1.2f; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_sword_blade"; - case 1: - return "_sword_blade_broken"; - case 2: - return "_sword_handle"; - case 3: - return "_sword_accessory"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_sword_blade"; + case 1: + return "_sword_blade_broken"; + case 2: + return "_sword_handle"; + case 3: + return "_sword_accessory"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_sword_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "broadsword"; } /* * @Override - * + * * @SideOnly(Side.CLIENT) public void onUpdate (ItemStack stack, World * world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, * world, entity, par4, par5); if (entity instanceof EntityPlayerSP) { diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index d7efa760ed0..48eff5add92 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -15,28 +15,23 @@ import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class Chisel extends ToolCore -{ - public Chisel() - { +public class Chisel extends ToolCore { + public Chisel() { super(0); this.setUnlocalizedName("InfiTool.Chisel"); this.setContainerItem(this); } @Override - public ItemStack getContainerItem (ItemStack itemStack) - { - if (itemStack.hasTagCompound()) - { + public ItemStack getContainerItem(ItemStack itemStack) { + if (itemStack.hasTagCompound()) { int reinforced = 0; NBTTagCompound tags = itemStack.getTagCompound(); if (tags.getCompoundTag("InfiTool").hasKey("Unbreaking")) reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); - if (random.nextInt(10) < 10 - reinforced) - { + if (random.nextInt(10) < 10 - reinforced) { AbilityHelper.damageTool(itemStack, 1, null, false); } } @@ -44,51 +39,50 @@ public ItemStack getContainerItem (ItemStack itemStack) } @Override - public boolean doesContainerItemLeaveCraftingGrid (ItemStack par1ItemStack) - { - return par1ItemStack.hasTagCompound() && par1ItemStack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"); + public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { + return par1ItemStack.hasTagCompound() + && par1ItemStack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"); } - boolean performDetailing (World world, int x, int y, int z, int blockID, int blockMeta) - { + boolean performDetailing(World world, int x, int y, int z, int blockID, int blockMeta) { boolean detailed = false; return detailed; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { return false; } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer entityplayer) - { - if (entityplayer.capabilities.isCreativeMode) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer entityplayer) { + if (entityplayer.capabilities.isCreativeMode) { onEaten(stack, world, entityplayer); - } - else - { + } else { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.getBoolean("Broken")) - entityplayer.setItemInUse(stack, getMaxItemUseDuration(stack)); + if (!tags.getBoolean("Broken")) entityplayer.setItemInUse(stack, getMaxItemUseDuration(stack)); } return stack; } @Override - public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer entityplayer) - { - if (!world.isRemote) - { + public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { + if (!world.isRemote) { MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(world, entityplayer, true); - if (movingobjectposition == null) - { + if (movingobjectposition == null) { return itemstack; } - if (movingobjectposition.typeOfHit == MovingObjectType.BLOCK) - { + if (movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { int x = movingobjectposition.blockX; int y = movingobjectposition.blockY; int z = movingobjectposition.blockZ; @@ -96,19 +90,16 @@ public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer entityp int meta = world.getBlockMetadata(x, y, z); DetailInput details = TConstruct.chiselDetailing.getDetailing(block, meta); - if (details != null) - { + if (details != null) { world.setBlock(x, y, z, Block.getBlockFromItem(details.output.getItem()), details.outputMeta, 3); - if (!(entityplayer.capabilities.isCreativeMode)) - { + if (!(entityplayer.capabilities.isCreativeMode)) { int reinforced = 0; NBTTagCompound tags = itemstack.getTagCompound(); if (tags.getCompoundTag("InfiTool").hasKey("Unbreaking")) reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); - if (random.nextInt(10) < 10 - reinforced) - { + if (random.nextInt(10) < 10 - reinforced) { AbilityHelper.damageTool(itemstack, 1, null, false); } } @@ -123,15 +114,12 @@ public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer entityp @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 2.0; player.movementInput.moveStrafe *= 2.0; } @@ -139,82 +127,68 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo } @Override - public int getMaxItemUseDuration (ItemStack itemstack) - { - if (!itemstack.hasTagCompound()) - return 20; + public int getMaxItemUseDuration(ItemStack itemstack) { + if (!itemstack.hasTagCompound()) return 20; int speed = itemstack.getTagCompound().getCompoundTag("InfiTool").getInteger("MiningSpeed") / 100; int truespeed = 20 - speed; - if (truespeed < 0) - truespeed = 0; + if (truespeed < 0) truespeed = 0; return truespeed; } @Override - public EnumAction getItemUseAction (ItemStack itemstack) - { + public EnumAction getItemUseAction(ItemStack itemstack) { return EnumAction.eat; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 2; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_chisel_head"; - case 1: - return "_chisel_head_broken"; - case 2: - return "_chisel_handle"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_chisel_head"; + case 1: + return "_chisel_head_broken"; + case 2: + return "_chisel_handle"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_chisel_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "chisel"; } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.chiselHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return null; } @Override - public String[] getTraits () - { - return new String[] { "utility" }; + public String[] getTraits() { + return new String[] {"utility"}; } - } diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index 4f4523f0a86..3025b13bd44 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -9,118 +9,100 @@ import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class Cleaver extends Weapon -{ - public Cleaver() - { +public class Cleaver extends Weapon { + public Cleaver() { super(5); this.setUnlocalizedName("InfiTool.Cleaver"); } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.largeSwordBlade; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toughRod; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.largePlate; } @Override - public Item getExtraItem () - { + public Item getExtraItem() { return TinkerTools.toughRod; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } @Override - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 1; } @Override - public float getRepairCost () - { + public float getRepairCost() { return 4.0f; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 2.5f; } @Override - public float getDamageModifier () - { + public float getDamageModifier() { return 1.4f; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 4; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_cleaver_head"; - case 1: - return "_cleaver_head_broken"; - case 2: - return "_cleaver_handle"; - case 3: - return "_cleaver_shield"; - case 4: - return "_cleaver_guard"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_cleaver_head"; + case 1: + return "_cleaver_head_broken"; + case 2: + return "_cleaver_handle"; + case 3: + return "_cleaver_shield"; + case 4: + return "_cleaver_guard"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_cleaver_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "cleaver"; } /* Cleaver specific */ @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) - { - if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) - { + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) { entity.hurtResistantTime += 7; /* * if (entity instanceof EntityLiving) { EntityLiving living = * (EntityLiving) entity; if (living.getHealth() <= 0) { - * + * * } } */ // if (entity.getHealth() <= 0) @@ -129,15 +111,12 @@ public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity e } @Override - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayer) - { + if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; ItemStack equipped = player.getCurrentEquippedItem(); - if (equipped == stack) - { + if (equipped == stack) { player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 2, 2, true)); } } diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java index abc29c13d84..5612d03d297 100644 --- a/src/main/java/tconstruct/items/tools/Cutlass.java +++ b/src/main/java/tconstruct/items/tools/Cutlass.java @@ -4,59 +4,50 @@ import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -public class Cutlass extends Weapon -{ - public Cutlass() - { +public class Cutlass extends Weapon { + public Cutlass() { super(4); this.setUnlocalizedName("InfiTool.Cutlass"); } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.swordBlade; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.fullGuard; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_cutlass_blade"; - case 1: - return "_cutlass_blade_broken"; - case 2: - return "_cutlass_handle"; - case 3: - return "_cutlass_guard"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_cutlass_blade"; + case 1: + return "_cutlass_blade_broken"; + case 2: + return "_cutlass_handle"; + case 3: + return "_cutlass_guard"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_cutlass_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "cutlass"; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 1; } } diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index 3b5685f6ec6..d047bfd7954 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -7,24 +7,19 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.DaggerEntity; -public class Dagger extends Weapon -{ - public Dagger() - { +public class Dagger extends Weapon { + public Dagger() { super(1); this.setUnlocalizedName("InfiTool.Dagger"); } @Override - public ItemStack onItemRightClick (ItemStack itemstack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { ItemStack stack = itemstack.copy(); - if (!world.isRemote) - { + if (!world.isRemote) { DaggerEntity dagger = new DaggerEntity(world, player, 1.5f, 0, stack); - //dagger.motionY++; - if (player.capabilities.isCreativeMode) - dagger.canBePickedUp = 2; + // dagger.motionY++; + if (player.capabilities.isCreativeMode) dagger.canBePickedUp = 2; world.spawnEntityInWorld(dagger); } itemstack.stackSize--; @@ -32,13 +27,11 @@ public ItemStack onItemRightClick (ItemStack itemstack, World world, EntityPlaye } @Override - public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer player) - { + public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer player) { ItemStack stack = itemstack.copy(); - if (!world.isRemote) - { + if (!world.isRemote) { DaggerEntity dagger = new DaggerEntity(world, player, 1.5f, 0, stack); - //dagger.motionY++; + // dagger.motionY++; world.spawnEntityInWorld(dagger); } itemstack.stackSize--; @@ -46,67 +39,57 @@ public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer player) } @Override - public String[] getTraits () - { - return new String[] { "weapon", "melee", "throwing" }; + public String[] getTraits() { + return new String[] {"weapon", "melee", "throwing"}; } @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration (ItemStack stack) - { + public int getMaxItemUseDuration(ItemStack stack) { return 10; } - public boolean rangedTool () - { + public boolean rangedTool() { return true; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_dagger_blade"; - case 1: - return "_dagger_blade_broken"; - case 2: - return "_dagger_handle"; - case 3: - return "_dagger_accessory"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_dagger_blade"; + case 1: + return "_dagger_blade_broken"; + case 2: + return "_dagger_handle"; + case 3: + return "_dagger_accessory"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_dagger_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "dagger"; } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.knifeBlade; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.crossbar; } } diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index ea19b967070..16d71870605 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -1,138 +1,112 @@ package tconstruct.items.tools; import cpw.mods.fml.relauncher.*; -import mantle.world.WorldHelper; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; import tconstruct.library.*; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class Excavator extends AOEHarvestTool -{ - public Excavator() - { - super(2, 1,0); +public class Excavator extends AOEHarvestTool { + public Excavator() { + super(2, 1, 0); this.setUnlocalizedName("InfiTool.Excavator"); } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "shovel"; } - static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + static Material[] materials = { + Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay + }; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.excavatorHead; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toughRod; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.largePlate; } @Override - public Item getExtraItem () - { + public Item getExtraItem() { return TinkerTools.toughBinding; } @Override - public float getRepairCost () - { + public float getRepairCost() { return 4.0f; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 2.75f; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } @Override - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 1; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 4; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_excavator_head"; - case 1: - return "_excavator_head_broken"; - case 2: - return "_excavator_handle"; - case 3: - return "_excavator_binding"; - case 4: - return "_excavator_grip"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_excavator_head"; + case 1: + return "_excavator_head_broken"; + case 2: + return "_excavator_handle"; + case 3: + return "_excavator_binding"; + case 4: + return "_excavator_grip"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_excavator_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "excavator"; } @Override - public float breakSpeedModifier () - { + public float breakSpeedModifier() { return 0.4f; } @Override - public float stoneboundModifier () - { + public float stoneboundModifier() { return 216f; } - } diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index 07d743c0c8e..8ab3701fc30 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -15,46 +15,50 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.EquipLogic; -public class FryingPan extends Weapon -{ - public FryingPan() - { +public class FryingPan extends Weapon { + public FryingPan() { super(2); this.setUnlocalizedName("InfiTool.FryPan"); } @Override - public boolean hitEntity (ItemStack stack, EntityLivingBase mob, EntityLivingBase player) - { + public boolean hitEntity(ItemStack stack, EntityLivingBase mob, EntityLivingBase player) { AbilityHelper.knockbackEntity(mob, 1.7f); mob.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 0)); // 5 - // seconds - // of - // stun + // seconds + // of + // stun return true; } @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity mob) - { + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity mob) { if (mob.canAttackWithItem() && !mob.hitByEntity(player) && mob.hurtResistantTime < 14) AbilityHelper.onLeftClickEntity(stack, player, mob, this); return false; } @Override - public void onEntityDamaged (World world, EntityLivingBase player, Entity entity) - { - world.playSoundEffect(entity.posX, entity.posY, entity.posZ, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); + public void onEntityDamaged(World world, EntityLivingBase player, Entity entity) { + world.playSoundEffect( + entity.posX, + entity.posY, + entity.posZ, + "tinker:frypan_hit", + 1.0F, + (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); } @Override - public void getSubItems (Item id, CreativeTabs tab, List list) - { + public void getSubItems(Item id, CreativeTabs tab, List list) { super.getSubItems(id, tab, list); Item accessory = getAccessoryItem(); - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 2), new ItemStack(getHandleItem(), 1, 16), null, StatCollector.translateToLocal("tool.baneofpigs")); + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, 2), + new ItemStack(getHandleItem(), 1, 16), + null, + StatCollector.translateToLocal("tool.baneofpigs")); NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean("Special", true); @@ -64,7 +68,7 @@ public void getSubItems (Item id, CreativeTabs tab, List list) tags.setInteger("BaseDurability", Integer.MAX_VALUE / 100); tags.setInteger("MiningSpeed", Integer.MAX_VALUE / 100); - int[] keyPair = new int[] { Integer.MAX_VALUE / 100, 0, 0 }; + int[] keyPair = new int[] {Integer.MAX_VALUE / 100, 0, 0}; tags.setIntArray("Blaze", keyPair); tags.setInteger("Necrotic", Integer.MAX_VALUE / 100); tags.setInteger("Effect1", 7); @@ -74,56 +78,51 @@ public void getSubItems (Item id, CreativeTabs tab, List list) } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { - if (side == 0 || !player.isSneaking()) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { + if (side == 0 || !player.isSneaking()) { return false; - } - else if (!world.getBlock(x, y, z).getMaterial().isSolid()) - { + } else if (!world.getBlock(x, y, z).getMaterial().isSolid()) { return false; - } - else - { - if (side == 1) - { + } else { + if (side == 1) { ++y; } - if (side == 2) - { + if (side == 2) { --z; } - if (side == 3) - { + if (side == 3) { ++z; } - if (side == 4) - { + if (side == 4) { --x; } - if (side == 5) - { + if (side == 5) { ++x; } - if (!player.canPlayerEdit(x, y, z, side, stack)) - { + if (!player.canPlayerEdit(x, y, z, side, stack)) { return false; - } - else if (!TinkerTools.heldItemBlock.canPlaceBlockAt(world, x, y, z)) - { + } else if (!TinkerTools.heldItemBlock.canPlaceBlockAt(world, x, y, z)) { return false; - } - else - { + } else { world.setBlock(x, y, z, TinkerTools.heldItemBlock, 0, 3); TinkerTools.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); - world.playSoundEffect(x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); + world.playSoundEffect( + x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); EquipLogic logic = (EquipLogic) world.getTileEntity(x, y, z); logic.setEquipmentItem(stack); @@ -135,56 +134,48 @@ else if (!TinkerTools.heldItemBlock.canPlaceBlockAt(world, x, y, z)) } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.frypanHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return null; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 2; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_frypan_head"; - case 1: - return "_frypan_head_broken"; - case 2: - return "_frypan_handle"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_frypan_head"; + case 1: + return "_frypan_head_broken"; + case 2: + return "_frypan_handle"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_frypan_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "frypan"; } } diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index d0d2a2a9eb9..2f97f872e27 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -2,153 +2,130 @@ import cpw.mods.fml.relauncher.*; import java.util.List; -import mantle.world.WorldHelper; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent; import tconstruct.library.*; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class Hammer extends AOEHarvestTool -{ - public Hammer() - { +public class Hammer extends AOEHarvestTool { + public Hammer() { super(2, 1, 0); this.setUnlocalizedName("InfiTool.Hammer"); } @Override - public int getPartAmount () - { + public int getPartAmount() { return 4; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } @Override - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 2; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "pickaxe"; } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } - static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil }; + static Material[] materials = + new Material[] {Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil + }; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.hammerHead; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toughRod; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.largePlate; } @Override - public Item getExtraItem () - { + public Item getExtraItem() { return TinkerTools.largePlate; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 4.5f; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_hammer_head"; - case 1: - return "_hammer_handle_broken"; - case 2: - return "_hammer_handle"; - case 3: - return "_hammer_front"; - case 4: - return "_hammer_back"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_hammer_head"; + case 1: + return "_hammer_handle_broken"; + case 2: + return "_hammer_handle"; + case 3: + return "_hammer_front"; + case 4: + return "_hammer_back"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_hammer_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "hammer"; } @Override - public IIcon getIcon (ItemStack stack, int renderPass) - { + public IIcon getIcon(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); if (renderPass == 0) // Handle { - if (tags.getBoolean("Broken")) - return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle")); + if (tags.getBoolean("Broken")) return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle")); return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle")); - } - else if(renderPass == 1) - return getCorrectIcon(headIcons, tags.getInteger("RenderHead")); + } else if (renderPass == 1) return getCorrectIcon(headIcons, tags.getInteger("RenderHead")); } return super.getIcon(stack, renderPass); } @Override - public void getSubItems (Item id, CreativeTabs tab, List list) - { + public void getSubItems(Item id, CreativeTabs tab, List list) { super.getSubItems(id, tab, list); - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 10), new ItemStack(getHandleItem(), 1, 8), new ItemStack(getAccessoryItem(), 1, 11), new ItemStack(getExtraItem(), 1, 11), StatCollector.translateToLocal("tool.infiminer")); + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, 10), + new ItemStack(getHandleItem(), 1, 8), + new ItemStack(getAccessoryItem(), 1, 11), + new ItemStack(getExtraItem(), 1, 11), + StatCollector.translateToLocal("tool.infiminer")); NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean("Special", true); @@ -163,24 +140,18 @@ public void getSubItems (Item id, CreativeTabs tab, List list) list.add(tool); } - - @Override - public float breakSpeedModifier () - { + public float breakSpeedModifier() { return 0.4f; } @Override - public float stoneboundModifier () - { + public float stoneboundModifier() { return 216f; } @Override - public String[] getTraits () - { - return new String[] { "weapon", "harvest", "melee", "bludgeoning" }; + public String[] getTraits() { + return new String[] {"weapon", "harvest", "melee", "bludgeoning"}; } - } diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 2ec097d8939..42064d40134 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -9,88 +9,77 @@ import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class Hatchet extends HarvestTool -{ - public Hatchet() - { +public class Hatchet extends HarvestTool { + public Hatchet() { super(3); this.setUnlocalizedName("InfiTool.Axe"); } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "axe"; } @Override - public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) - { - if (block != null && block.getMaterial() == Material.leaves) - return false; + public boolean onBlockDestroyed( + ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + if (block != null && block.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, Material.gourd }; + static Material[] materials = { + Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, Material.gourd + }; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.hatchetHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return null; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 2; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_axe_head"; - case 1: - return "_axe_head_broken"; - case 2: - return "_axe_handle"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_axe_head"; + case 1: + return "_axe_head_broken"; + case 2: + return "_axe_handle"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_axe_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "axe"; } } diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 36f8138e739..6dfb957b840 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -10,49 +10,42 @@ import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -public class Longsword extends Weapon -{ - public Longsword() - { +public class Longsword extends Weapon { + public Longsword() { super(4); this.setUnlocalizedName("InfiTool.Longsword"); } @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.bow; } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { - if (player.onGround) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (player.onGround) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } return stack; } @Override - public float chargeAttack () - { + public float chargeAttack() { return 1.5f; } @Override - public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int useCount) - { + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int useCount) { /* * if (player.onGround) { int time = this.getMaxItemUseDuration(stack) - * useCount; if (time > 5) { player.addExhaustion(0.2F); * player.setSprinting(true); - * + * * float speed = 0.05F * time; if (speed > 0.925f) speed = 0.925f; - * + * * float increase = (float) (0.02 * time + 0.2); if (increase > 0.56f) * increase = 0.56f; player.motionY += increase + speed/3; - * + * * player.motionX = (double) (-MathHelper.sin(player.rotationYaw / * 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / * 180.0F * (float) Math.PI) * speed); player.motionZ = (double) @@ -61,35 +54,33 @@ public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer pla * speed); } } */ int time = this.getMaxItemUseDuration(stack) - useCount; - if (time > 5) - { + if (time > 5) { player.addExhaustion(0.2F); player.setSprinting(true); float increase = (float) (0.02 * time + 0.2); - if (increase > 0.56f) - increase = 0.56f; + if (increase > 0.56f) increase = 0.56f; player.motionY += increase; float speed = 0.05F * time; - if (speed > 0.925f) - speed = 0.925f; - player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * speed); - player.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * speed); + if (speed > 0.925f) speed = 0.925f; + player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) + * speed); + player.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) + * speed); } } @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 5.0F; player.movementInput.moveStrafe *= 5.0F; } @@ -97,44 +88,38 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.swordBlade; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.handGuard; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_longsword_blade"; - case 1: - return "_longsword_blade_broken"; - case 2: - return "_longsword_handle"; - case 3: - return "_longsword_accessory"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_longsword_blade"; + case 1: + return "_longsword_blade_broken"; + case 2: + return "_longsword_handle"; + case 3: + return "_longsword_accessory"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_longsword_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "longsword"; } } diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 9aa16f46bfa..71e98f28a52 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -1,17 +1,16 @@ package tconstruct.items.tools; -import java.util.Queue; -import java.util.Set; -import java.util.Stack; -import java.lang.LinkageError; - import com.google.common.collect.Lists; - +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.*; import gnu.trove.set.hash.THashSet; +import java.util.Queue; +import java.util.Set; +import java.util.Stack; import mantle.player.PlayerUtils; -import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -23,52 +22,42 @@ import tconstruct.library.*; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -public class LumberAxe extends AOEHarvestTool -{ - public LumberAxe() - { - super(0, 1,1); +public class LumberAxe extends AOEHarvestTool { + public LumberAxe() { + super(0, 1, 1); this.setUnlocalizedName("InfiTool.LumberAxe"); } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "axe"; } @Override - public float getRepairCost () - { + public float getRepairCost() { return 4.0f; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 2.5f; } @Override - public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) - { - if (block != null && block.getMaterial() == Material.leaves) - return false; + public boolean onBlockDestroyed( + ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + if (block != null && block.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd }; + static Material[] materials = {Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd}; /* Lumber axe specific */ @@ -83,32 +72,28 @@ public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, */ @Override - public float breakSpeedModifier () - { + public float breakSpeedModifier() { return 0.4f; } @Override - public float stoneboundModifier () - { + public float stoneboundModifier() { return 216f; } @Override - public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) - { - if (!stack.hasTagCompound() || player.isSneaking()) - return super.onBlockStartBreak(stack, x, y, z, player); + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + if (!stack.hasTagCompound() || player.isSneaking()) return super.onBlockStartBreak(stack, x, y, z, player); World world = player.worldObj; final Block wood = world.getBlock(x, y, z); - if (wood == null) - return super.onBlockStartBreak(stack, x, y, z, player); + if (wood == null) return super.onBlockStartBreak(stack, x, y, z, player); if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) - if(detectTree(world, x,y,z)) { - TreeChopTask chopper = new TreeChopTask((AOEHarvestTool)this, stack, new ChunkPosition(x, y, z), player, 128); + if (detectTree(world, x, y, z)) { + TreeChopTask chopper = + new TreeChopTask((AOEHarvestTool) this, stack, new ChunkPosition(x, y, z), player, 128); try { FMLCommonHandler.instance().bus().register(chopper); } catch (LinkageError l) { @@ -122,57 +107,59 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl return super.onBlockStartBreak(stack, x, y, z, player); } - public static boolean detectTree(World world, int pX, int pY, int pZ) { - ChunkPosition pos = null; - Stack candidates = new Stack<>(); - candidates.add(new ChunkPosition(pX, pY, pZ)); - - while (!candidates.isEmpty()) { - ChunkPosition candidate = candidates.pop(); - int curX = candidate.chunkPosX, curY = candidate.chunkPosY, curZ = candidate.chunkPosZ; - - Block block = world.getBlock(curX, curY, curZ); - if ((pos == null || candidate.chunkPosY > pos.chunkPosY) && block.isWood(world, curX, curY, curZ)) { - pos = new ChunkPosition(curX, candidate.chunkPosY + 1, curZ); - // go up - while (world.getBlock(curX, pos.chunkPosY, curZ).isWood(world, curX, pos.chunkPosY, curZ)) { - pos = new ChunkPosition(curX, pos.chunkPosY + 1, curZ); - } - // check if we still have a way diagonally up - candidates.add(new ChunkPosition(curX + 1, pos.chunkPosY + 1, curZ )); - candidates.add(new ChunkPosition(curX , pos.chunkPosY + 1, curZ + 1)); - candidates.add(new ChunkPosition(curX - 1, pos.chunkPosY + 1, curZ )); - candidates.add(new ChunkPosition(curX , pos.chunkPosY + 1, curZ - 1)); - } - } - - // not even one match, so there were no logs. - if (pos == null) { - return false; - } - - // check if there were enough leaves around the last position - // pos now contains the block above the topmost log - // we want at least 5 leaves in the surrounding 26 blocks - int d = 3; - int leaves = 0; - for (int offX = 0; offX < d; offX++) { - for (int offY = 0; offY < d; offY++) { - for (int offZ = 0; offZ < d; offZ++) { - int xPos = pos.chunkPosX -1 + offX, yPos = pos.chunkPosY - 1 + offY, zPos = pos.chunkPosZ - 1 + offZ; - Block leaf = world.getBlock(xPos, yPos, zPos); - if (leaf != null && leaf.isLeaves(world, xPos, yPos, zPos)) { - if (++leaves >= 5) { - return true; - } - } - } - } - } - - // not enough leaves. sorreh - return false; - } + public static boolean detectTree(World world, int pX, int pY, int pZ) { + ChunkPosition pos = null; + Stack candidates = new Stack<>(); + candidates.add(new ChunkPosition(pX, pY, pZ)); + + while (!candidates.isEmpty()) { + ChunkPosition candidate = candidates.pop(); + int curX = candidate.chunkPosX, curY = candidate.chunkPosY, curZ = candidate.chunkPosZ; + + Block block = world.getBlock(curX, curY, curZ); + if ((pos == null || candidate.chunkPosY > pos.chunkPosY) && block.isWood(world, curX, curY, curZ)) { + pos = new ChunkPosition(curX, candidate.chunkPosY + 1, curZ); + // go up + while (world.getBlock(curX, pos.chunkPosY, curZ).isWood(world, curX, pos.chunkPosY, curZ)) { + pos = new ChunkPosition(curX, pos.chunkPosY + 1, curZ); + } + // check if we still have a way diagonally up + candidates.add(new ChunkPosition(curX + 1, pos.chunkPosY + 1, curZ)); + candidates.add(new ChunkPosition(curX, pos.chunkPosY + 1, curZ + 1)); + candidates.add(new ChunkPosition(curX - 1, pos.chunkPosY + 1, curZ)); + candidates.add(new ChunkPosition(curX, pos.chunkPosY + 1, curZ - 1)); + } + } + + // not even one match, so there were no logs. + if (pos == null) { + return false; + } + + // check if there were enough leaves around the last position + // pos now contains the block above the topmost log + // we want at least 5 leaves in the surrounding 26 blocks + int d = 3; + int leaves = 0; + for (int offX = 0; offX < d; offX++) { + for (int offY = 0; offY < d; offY++) { + for (int offZ = 0; offZ < d; offZ++) { + int xPos = pos.chunkPosX - 1 + offX, + yPos = pos.chunkPosY - 1 + offY, + zPos = pos.chunkPosZ - 1 + offZ; + Block leaf = world.getBlock(xPos, yPos, zPos); + if (leaf != null && leaf.isLeaves(world, xPos, yPos, zPos)) { + if (++leaves >= 5) { + return true; + } + } + } + } + } + + // not enough leaves. sorreh + return false; + } public static class TreeChopTask { @@ -185,165 +172,154 @@ public static class TreeChopTask { public Queue blocks = Lists.newLinkedList(); public Set visited = new THashSet<>(); - public TreeChopTask(AOEHarvestTool tool, ItemStack stack, ChunkPosition start, EntityPlayer player, int blocksPerTick) { - this.world = player.getEntityWorld(); - this.player = player; - this.tool = tool; - this.stack = stack; - this.blocksPerTick = blocksPerTick; - - this.blocks.add(start); - } - - private void queueCoordinate(int x, int y, int z) { - ChunkPosition pos = new ChunkPosition(x, y, z); - if (!visited.contains(pos)) { - blocks.add(pos); - } - } - - @SubscribeEvent - public void onWorldTick(TickEvent.WorldTickEvent event) { - if (event.side.isClient()) { - finish(); - return; - } - // only if same dimension - if (event.world.provider.dimensionId != world.provider.dimensionId) { - return; - } - - // setup - int left = blocksPerTick; - NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - - // continue running - ChunkPosition pos; - while (left > 0) { - // completely done or can't do our job anymore?! - if (blocks.isEmpty() || tags.getBoolean("Broken")) { - finish(); - return; - } - - pos = blocks.remove(); - if (!visited.add(pos)) { - continue; - } - int x = pos.chunkPosX, y = pos.chunkPosY, z = pos.chunkPosZ; - - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - - // can we harvest the block and is effective? - if (!block.isWood(world, x, y, z) || !tool.isEffective(block, meta)) { - continue; - } - - // save its neighbors - queueCoordinate(x + 1, y, z ); - queueCoordinate(x, y, z + 1); - queueCoordinate(x - 1, y, z ); - queueCoordinate(x, y, z - 1); - - // also add the layer above.. stupid acacia trees - for (int offX = 0; offX < 3; offX++) { - for (int offZ = 0; offZ < 3; offZ++) { - queueCoordinate(x - 1 + offX, y + 1, z - 1 + offZ); - } - } - - // break it, wooo! - boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { - if (mod.beforeBlockBreak(tool, stack, x, y, z, player)) { - cancelHarvest = true; - } - } - if(!cancelHarvest) - tool.breakExtraBlock(player.worldObj, x, y, z, 0, player, x, y, z); - - left--; - } - } - - private void finish() { - // goodbye cruel world - FMLCommonHandler.instance().bus().unregister(this); - } - } + public TreeChopTask( + AOEHarvestTool tool, ItemStack stack, ChunkPosition start, EntityPlayer player, int blocksPerTick) { + this.world = player.getEntityWorld(); + this.player = player; + this.tool = tool; + this.stack = stack; + this.blocksPerTick = blocksPerTick; + + this.blocks.add(start); + } + + private void queueCoordinate(int x, int y, int z) { + ChunkPosition pos = new ChunkPosition(x, y, z); + if (!visited.contains(pos)) { + blocks.add(pos); + } + } + + @SubscribeEvent + public void onWorldTick(TickEvent.WorldTickEvent event) { + if (event.side.isClient()) { + finish(); + return; + } + // only if same dimension + if (event.world.provider.dimensionId != world.provider.dimensionId) { + return; + } + + // setup + int left = blocksPerTick; + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + + // continue running + ChunkPosition pos; + while (left > 0) { + // completely done or can't do our job anymore?! + if (blocks.isEmpty() || tags.getBoolean("Broken")) { + finish(); + return; + } + + pos = blocks.remove(); + if (!visited.add(pos)) { + continue; + } + int x = pos.chunkPosX, y = pos.chunkPosY, z = pos.chunkPosZ; + + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + + // can we harvest the block and is effective? + if (!block.isWood(world, x, y, z) || !tool.isEffective(block, meta)) { + continue; + } + + // save its neighbors + queueCoordinate(x + 1, y, z); + queueCoordinate(x, y, z + 1); + queueCoordinate(x - 1, y, z); + queueCoordinate(x, y, z - 1); + + // also add the layer above.. stupid acacia trees + for (int offX = 0; offX < 3; offX++) { + for (int offZ = 0; offZ < 3; offZ++) { + queueCoordinate(x - 1 + offX, y + 1, z - 1 + offZ); + } + } + + // break it, wooo! + boolean cancelHarvest = false; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + if (mod.beforeBlockBreak(tool, stack, x, y, z, player)) { + cancelHarvest = true; + } + } + if (!cancelHarvest) tool.breakExtraBlock(player.worldObj, x, y, z, 0, player, x, y, z); + + left--; + } + } + + private void finish() { + // goodbye cruel world + FMLCommonHandler.instance().bus().unregister(this); + } + } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.broadAxeHead; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toughRod; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.largePlate; } @Override - public Item getExtraItem () - { + public Item getExtraItem() { return TinkerTools.toughBinding; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 4; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_lumberaxe_head"; - case 1: - return "_lumberaxe_head_broken"; - case 2: - return "_lumberaxe_handle"; - case 3: - return "_lumberaxe_shield"; - case 4: - return "_lumberaxe_binding"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_lumberaxe_head"; + case 1: + return "_lumberaxe_head_broken"; + case 2: + return "_lumberaxe_handle"; + case 3: + return "_lumberaxe_shield"; + case 4: + return "_lumberaxe_binding"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_lumberaxe_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "lumberaxe"; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } @Override - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 1; } } diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index 684e916f36b..9d5aff0fee0 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -10,119 +10,108 @@ import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -public class Mattock extends DualHarvestTool -{ - public Mattock() - { +public class Mattock extends DualHarvestTool { + public Mattock() { super(3); this.setUnlocalizedName("InfiTool.Mattock"); } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return axeMaterials; } @Override - protected Material[] getEffectiveSecondaryMaterials () - { + protected Material[] getEffectiveSecondaryMaterials() { return shovelMaterials; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "axe"; } @Override - protected String getSecondHarvestType () - { + protected String getSecondHarvestType() { return "shovel"; } - static Material[] axeMaterials = { Material.wood, Material.cactus, Material.plants, Material.vine, Material.gourd }; - static Material[] shovelMaterials = { Material.grass, Material.ground, Material.clay }; + static Material[] axeMaterials = {Material.wood, Material.cactus, Material.plants, Material.vine, Material.gourd}; + static Material[] shovelMaterials = {Material.grass, Material.ground, Material.clay}; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.hatchetHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.shovelHead; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 2; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_mattock_head"; - case 1: - return "_mattock_head_broken"; - case 2: - return "_mattock_handle"; - case 3: - return "_mattock_back"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_mattock_head"; + case 1: + return "_mattock_head_broken"; + case 2: + return "_mattock_handle"; + case 3: + return "_mattock_back"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_mattock_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "mattock"; } /* Mattock specific */ @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return false; + if (tags.getBoolean("Broken")) return false; return AbilityHelper.hoeGround(stack, player, world, x, y, z, side, random); } @Override - public void buildTool (int id, String name, List list) - { - if (!PHConstruct.denyMattock || allowCrafting(id)) - { + public void buildTool(int id, String name, List list) { + if (!PHConstruct.denyMattock || allowCrafting(id)) { super.buildTool(id, name, list); } } - private boolean allowCrafting (int head) - { - int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; - for (int i = 0; i < nonMetals.length; i++) - { - if (head == nonMetals[i]) - return false; + private boolean allowCrafting(int head) { + int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; + for (int i = 0; i < nonMetals.length; i++) { + if (head == nonMetals[i]) return false; } return true; } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java index 8bc8be40246..6e8f2e5bd2b 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -5,68 +5,59 @@ import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; -public class Pickaxe extends HarvestTool -{ - public Pickaxe() - { +public class Pickaxe extends HarvestTool { + public Pickaxe() { super(1); this.setUnlocalizedName("InfiTool.Pickaxe"); } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "pickaxe"; } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } - static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits }; + static Material[] materials = new Material[] { + Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits + }; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.pickaxeHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.binding; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_pickaxe_head"; - case 1: - return "_pickaxe_head_broken"; - case 2: - return "_pickaxe_handle"; - case 3: - return "_pickaxe_accessory"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_pickaxe_head"; + case 1: + return "_pickaxe_head_broken"; + case 2: + return "_pickaxe_handle"; + case 3: + return "_pickaxe_accessory"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_pickaxe_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "pickaxe"; } - } diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 9e8de2935f3..4e6c2f123ae 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -13,14 +13,13 @@ import net.minecraft.world.World; import tconstruct.tools.entity.LaunchedPotion; -public class PotionLauncher extends Item -{ +public class PotionLauncher extends Item { @SideOnly(Side.CLIENT) private IIcon[] icons; - public static final String[] textureNames = new String[] { "potionlauncher" }; - public PotionLauncher() - { + public static final String[] textureNames = new String[] {"potionlauncher"}; + + public PotionLauncher() { super(); this.maxStackSize = 1; this.setCreativeTab(CreativeTabs.tabCombat); @@ -28,12 +27,10 @@ public PotionLauncher() } @Override - public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); boolean loaded = tags.getBoolean("Loaded"); - if (!loaded) - { + if (!loaded) { int slotID = getInventorySlotContainItem(Items.potionitem, player.inventory); ItemStack potion = player.inventory.getStackInSlot(slotID); @@ -42,31 +39,30 @@ public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) tags.setTag("LoadedPotion", potionTag); tags.setBoolean("Loaded", true); - if (!player.capabilities.isCreativeMode) - { + if (!player.capabilities.isCreativeMode) { potion.stackSize--; - if (potion.stackSize < 1) - player.inventory.setInventorySlotContents(slotID, null); + if (potion.stackSize < 1) player.inventory.setInventorySlotContents(slotID, null); } - world.playSoundEffect(player.posX, player.posY, player.posZ, "tinker:launcher_clank", 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.15F + 1.0F); + world.playSoundEffect( + player.posX, + player.posY, + player.posZ, + "tinker:launcher_clank", + 1.0F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.15F + 1.0F); } return stack; } @Override - public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int time) - { - - } + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int time) {} @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); int slotID = getInventorySlotContainItem(Items.potionitem, player.inventory); - if (!tags.getBoolean("Loaded") && slotID >= 0) - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + if (!tags.getBoolean("Loaded") && slotID >= 0) player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); return stack; } @@ -74,8 +70,7 @@ public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer pl * How long it takes to use or consume an item */ @Override - public int getMaxItemUseDuration (ItemStack stack) - { + public int getMaxItemUseDuration(ItemStack stack) { return 30; } @@ -84,36 +79,31 @@ public int getMaxItemUseDuration (ItemStack stack) * is being used */ @Override - public EnumAction getItemUseAction (ItemStack stack) - { - if (stack != null && stack.hasTagCompound() && !stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) - return EnumAction.bow; - else - return EnumAction.none; + public EnumAction getItemUseAction(ItemStack stack) { + if (stack != null + && stack.hasTagCompound() + && !stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Loaded")) return EnumAction.bow; + else return EnumAction.none; } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister par1IconRegister) - { + public void registerIcons(IIconRegister par1IconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = par1IconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) - { + public IIcon getIconFromDamage(int meta) { return icons[0]; } @Override - public void getSubItems (Item b, CreativeTabs tabs, List list) - { + public void getSubItems(Item b, CreativeTabs tabs, List list) { ItemStack stack = new ItemStack(b, 1, 0); NBTTagCompound compound = new NBTTagCompound(); NBTTagCompound tags = new NBTTagCompound(); @@ -127,22 +117,17 @@ public void getSubItems (Item b, CreativeTabs tabs, List list) } @Override - public boolean onEntitySwing (EntityLivingBase player, ItemStack stack) - { - if (stack != null && stack.hasTagCompound()) - { + public boolean onEntitySwing(EntityLivingBase player, ItemStack stack) { + if (stack != null && stack.hasTagCompound()) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Loaded")) - { + if (tags.getBoolean("Loaded")) { NBTTagCompound potionTag = tags.getCompoundTag("LoadedPotion"); - ItemStack potion = ItemStack.loadItemStackFromNBT(potionTag);// findPotion(player);InventoryLogic - if (potion != null) - { + ItemStack potion = ItemStack.loadItemStackFromNBT(potionTag); // findPotion(player);InventoryLogic + if (potion != null) { World world = player.worldObj; world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if (!world.isRemote) - { + if (!world.isRemote) { world.spawnEntityInWorld(new LaunchedPotion(world, player, potion)); } tags.removeTag("LoadedPotion"); @@ -154,26 +139,20 @@ public boolean onEntitySwing (EntityLivingBase player, ItemStack stack) return false; } - ItemStack findPotion (EntityLivingBase living) - { - if (living instanceof EntityPlayer) - { + ItemStack findPotion(EntityLivingBase living) { + if (living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; int potionSlot = getInventorySlotContainItem(Items.potionitem, player.inventory); - if (potionSlot >= 0) - { + if (potionSlot >= 0) { return player.inventory.getStackInSlot(potionSlot); } } return null; } - int getInventorySlotContainItem (Item item, InventoryPlayer inventory) - { - for (int j = 0; j < inventory.mainInventory.length; ++j) - { - if (inventory.mainInventory[j] != null && inventory.mainInventory[j].getItem() == item) - { + int getInventorySlotContainItem(Item item, InventoryPlayer inventory) { + for (int j = 0; j < inventory.mainInventory.length; ++j) { + if (inventory.mainInventory[j] != null && inventory.mainInventory[j].getItem() == item) { return j; } } @@ -183,8 +162,7 @@ int getInventorySlotContainItem (Item item, InventoryPlayer inventory) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add(StatCollector.translateToLocal("potionlauncher.tooltip")); } } diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index 189df3da184..7a7900347be 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -9,54 +9,49 @@ import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -public class Rapier extends Weapon -{ - public Rapier() - { +public class Rapier extends Weapon { + public Rapier() { super(2); this.setUnlocalizedName("InfiTool.Rapier"); } @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.none; } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { - if (player.onGround) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (player.onGround) { player.addExhaustion(0.1f); player.motionY += 0.32; float f = 0.5F; - player.motionX = (double) (MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * f); - player.motionZ = (double) (-MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) * f); + player.motionX = (double) (MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) + * f); + player.motionZ = (double) (-MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) + * f); } return stack; } @Override - public boolean hitEntity (ItemStack stack, EntityLivingBase mob, EntityLivingBase player) - { + public boolean hitEntity(ItemStack stack, EntityLivingBase mob, EntityLivingBase player) { // AbilityHelper.hitEntity(stack, mob, player, damageVsEntity); // AbilityHelper.knockbackEntity(mob, 0.8f); mob.motionY *= 0.8; - if (mob.hurtResistantTime > 18) - mob.hurtResistantTime -= 5; + if (mob.hurtResistantTime > 18) mob.hurtResistantTime -= 5; return true; } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 0.7f; } @Override - public float getDamageModifier () - { + public float getDamageModifier() { return 0.8f; } @@ -65,56 +60,48 @@ public float getDamageModifier () */ @Override - public boolean pierceArmor () - { + public boolean pierceArmor() { return true; } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.swordBlade; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.crossbar; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_rapier_blade"; - case 1: - return "_rapier_blade_broken"; - case 2: - return "_rapier_handle"; - case 3: - return "_rapier_accessory"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_rapier_blade"; + case 1: + return "_rapier_blade_broken"; + case 2: + return "_rapier_handle"; + case 3: + return "_rapier_accessory"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_rapier_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "rapier"; } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return none; } } diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 2673154177e..c91edc8e138 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -23,10 +23,8 @@ import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class Scythe extends Weapon -{ - public Scythe() - { +public class Scythe extends Weapon { + public Scythe() { super(4); this.setUnlocalizedName("InfiTool.Scythe"); } @@ -36,210 +34,214 @@ public Scythe() */ @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } - static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine, Material.gourd }; + static Material[] materials = new Material[] { + Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine, Material.gourd + }; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.scytheBlade; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toughRod; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.toughBinding; } @Override - public Item getExtraItem () - { + public Item getExtraItem() { return TinkerTools.toughRod; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 4; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_scythe_head"; - case 1: - return "_scythe_head_broken"; - case 2: - return "_scythe_handle"; - case 3: - return "_scythe_binding"; - case 4: - return "_scythe_accessory"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_scythe_head"; + case 1: + return "_scythe_head_broken"; + case 2: + return "_scythe_handle"; + case 3: + return "_scythe_binding"; + case 4: + return "_scythe_accessory"; + default: + return ""; } } @Override - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 3.0f; } @Override - public float getRepairCost () - { + public float getRepairCost() { return 4.0f; } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_scythe_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "scythe"; } @Override - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 1; } @Override - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 1; } @Override - public float getDamageModifier () - { + public float getDamageModifier() { return 0.75f; } @Override - public String[] getTraits () - { - return new String[] { "weapon", "melee", "harvest" }; + public String[] getTraits() { + return new String[] {"weapon", "melee", "harvest"}; } /* Scythe Specific */ @Override - public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) - { - if (!stack.hasTagCompound()) - return false; + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + if (!stack.hasTagCompound()) return false; World world = player.worldObj; final Block blockB = world.getBlock(x, y, z); final int meta = world.getBlockMetadata(x, y, z); - if (!stack.hasTagCompound()) - return false; + if (!stack.hasTagCompound()) return false; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); boolean butter = EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0; int fortune = EnchantmentHelper.getFortuneModifier(player); - for (int xPos = x - 1; xPos <= x + 1; xPos++) - { - for (int yPos = y - 1; yPos <= y + 1; yPos++) - { - for (int zPos = z - 1; zPos <= z + 1; zPos++) - { - if (!(tags.getBoolean("Broken"))) - { + for (int xPos = x - 1; xPos <= x + 1; xPos++) { + for (int yPos = y - 1; yPos <= y + 1; yPos++) { + for (int zPos = z - 1; zPos <= z + 1; zPos++) { + if (!(tags.getBoolean("Broken"))) { boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - if (mod.beforeBlockBreak(this, stack, xPos, yPos, zPos, player)) - cancelHarvest = true; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + if (mod.beforeBlockBreak(this, stack, xPos, yPos, zPos, player)) cancelHarvest = true; } - if (!cancelHarvest) - { + if (!cancelHarvest) { Block localBlock = world.getBlock(xPos, yPos, zPos); int localMeta = world.getBlockMetadata(xPos, yPos, zPos); - float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos); - if (localBlock != null)// && (block.blockMaterial == Material.leaves || block.isLeaves(world, xPos, yPos, zPos))) + float localHardness = localBlock == null + ? Float.MAX_VALUE + : localBlock.getBlockHardness(world, xPos, yPos, zPos); + if (localBlock + != null) // && (block.blockMaterial == Material.leaves || block.isLeaves(world, + // xPos, yPos, zPos))) { - for (int iter = 0; iter < materials.length; iter++) - { - if (materials[iter] == localBlock.getMaterial()) - { - if (!player.capabilities.isCreativeMode) - { - if (butter && localBlock instanceof IShearable && ((IShearable) localBlock).isShearable(stack, player.worldObj, xPos, yPos, zPos)) - { - ArrayList drops = ((IShearable) localBlock).onSheared(stack, player.worldObj, xPos, yPos, zPos, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + for (int iter = 0; iter < materials.length; iter++) { + if (materials[iter] == localBlock.getMaterial()) { + if (!player.capabilities.isCreativeMode) { + if (butter + && localBlock instanceof IShearable + && ((IShearable) localBlock) + .isShearable(stack, player.worldObj, xPos, yPos, zPos)) { + ArrayList drops = ((IShearable) localBlock) + .onSheared( + stack, + player.worldObj, + xPos, + yPos, + zPos, + EnchantmentHelper.getEnchantmentLevel( + Enchantment.fortune.effectId, stack)); Random rand = new Random(); if (!world.isRemote) - for (ItemStack dropStack : drops) - { + for (ItemStack dropStack : drops) { float f = 0.7F; - double d = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(player.worldObj, (double) xPos + d, (double) yPos + d1, (double) zPos + d2, dropStack); + double d = (double) (rand.nextFloat() * f) + + (double) (1.0F - f) * 0.5D; + double d1 = (double) (rand.nextFloat() * f) + + (double) (1.0F - f) * 0.5D; + double d2 = (double) (rand.nextFloat() * f) + + (double) (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem( + player.worldObj, + (double) xPos + d, + (double) yPos + d1, + (double) zPos + d2, + dropStack); entityitem.delayBeforeCanPickup = 10; player.worldObj.spawnEntityInWorld(entityitem); } if (localHardness > 0f) - onBlockDestroyed(stack, world, localBlock, xPos, yPos, zPos, player); - player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(localBlock)], 1); + onBlockDestroyed( + stack, world, localBlock, xPos, yPos, zPos, player); + player.addStat( + StatList.mineBlockStatArray[Block.getIdFromBlock(localBlock)], + 1); world.setBlockToAir(xPos, yPos, zPos); - } - else - { + } else { // Workaround for dropping experience int exp = localBlock.getExpDrop(world, localMeta, fortune); localBlock.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); - if (localBlock.removedByPlayer(world, player, xPos, yPos, zPos, true)) - { - localBlock.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); + if (localBlock.removedByPlayer(world, player, xPos, yPos, zPos, true)) { + localBlock.onBlockDestroyedByPlayer( + world, xPos, yPos, zPos, localMeta); localBlock.harvestBlock(world, player, xPos, yPos, zPos, localMeta); // Workaround for dropping experience if (!butter) localBlock.dropXpOnBlockBreak(world, xPos, yPos, zPos, exp); } - if (world.isRemote) - { - INetHandler handler = FMLClientHandler.instance().getClientPlayHandler(); - if (handler != null && handler instanceof NetHandlerPlayClient) - { - NetHandlerPlayClient handlerClient = (NetHandlerPlayClient) handler; - handlerClient.addToSendQueue(new C07PacketPlayerDigging(0, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); - handlerClient.addToSendQueue(new C07PacketPlayerDigging(2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); + if (world.isRemote) { + INetHandler handler = FMLClientHandler.instance() + .getClientPlayHandler(); + if (handler != null && handler instanceof NetHandlerPlayClient) { + NetHandlerPlayClient handlerClient = + (NetHandlerPlayClient) handler; + handlerClient.addToSendQueue(new C07PacketPlayerDigging( + 0, + x, + y, + z, + Minecraft.getMinecraft().objectMouseOver.sideHit)); + handlerClient.addToSendQueue(new C07PacketPlayerDigging( + 2, + x, + y, + z, + Minecraft.getMinecraft().objectMouseOver.sideHit)); } } if (localHardness > 0f) - onBlockDestroyed(stack, world, localBlock, xPos, yPos, zPos, player); + onBlockDestroyed( + stack, world, localBlock, xPos, yPos, zPos, player); } - } - else - { + } else { world.setBlockToAir(xPos, yPos, zPos); } } @@ -250,21 +252,24 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl } } } - if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(blockB) + (meta << 12)); + if (!world.isRemote) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(blockB) + (meta << 12)); return super.onBlockStartBreak(stack, x, y, z, player); } @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) - { - AxisAlignedBB box = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.posX + 1.0D, entity.posY + 1.0D, entity.posZ + 1.0D).expand(1.0D, 1.0D, 1.0D); + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + AxisAlignedBB box = AxisAlignedBB.getBoundingBox( + entity.posX, + entity.posY, + entity.posZ, + entity.posX + 1.0D, + entity.posY + 1.0D, + entity.posZ + 1.0D) + .expand(1.0D, 1.0D, 1.0D); List list = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, box); - for (Object o : list) - { + for (Object o : list) { AbilityHelper.onLeftClickEntity(stack, player, (Entity) o, this); } return true; } - } diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index c2cafe20b03..e6e3a1a37da 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -16,93 +16,77 @@ import tconstruct.weaponry.TinkerWeaponry; @Deprecated -public class Shortbow extends BowBase -{ - public Shortbow() - { +public class Shortbow extends BowBase { + public Shortbow() { super(); this.setUnlocalizedName("InfiTool.Shortbow"); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_bow_top"; - case 1: - return "_bowstring_broken"; - case 2: - return "_bowstring"; - case 3: - return "_bow_bottom"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_bow_top"; + case 1: + return "_bowstring_broken"; + case 2: + return "_bowstring"; + case 3: + return "_bow_bottom"; + default: + return ""; } } - @Override protected int getDefaultColor(int renderPass, int materialID) { // bowstring uses custom material - if(renderPass == 0) { + if (renderPass == 0) { CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, BowstringMaterial.class); - if(mat != null) - return mat.color; + if (mat != null) return mat.color; } return super.getDefaultColor(renderPass, materialID); } - @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_bow_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "shortbow"; } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.toolRod; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerWeaponry.bowstring; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerTools.toolRod; } @Override - public String[] getTraits () - { - return new String[] { "weapon", "ranged", "bow" }; + public String[] getTraits() { + return new String[] {"weapon", "ranged", "bow"}; } @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 2.0F; player.movementInput.moveStrafe *= 2.0F; } @@ -111,60 +95,52 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("Energy")) - { + if (tags.hasKey("Energy")) { String color = ""; // double joules = this.getJoules(stack); int power = tags.getInteger("Energy"); - if (power != 0) - { - if (power <= this.getMaxEnergyStored(stack) / 3) - color = "\u00a74"; - else if (power > this.getMaxEnergyStored(stack) * 2 / 3) - color = "\u00a72"; - else - color = "\u00a76"; + if (power != 0) { + if (power <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; + else color = "\u00a76"; } - String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + String energy = new StringBuilder() + .append(color) + .append(tags.getInteger("Energy")) + .append("/") + .append(getMaxEnergyStored(stack)) + .append(" RF") + .toString(); list.add(energy); } - if (tags.hasKey("InfiTool")) - { + if (tags.hasKey("InfiTool")) { boolean broken = tags.getCompoundTag("InfiTool").getBoolean("Broken"); - if (broken) - list.add("\u00A7oBroken"); - else - { + if (broken) list.add("\u00A7oBroken"); + else { int head = tags.getCompoundTag("InfiTool").getInteger("Head"); int handle = tags.getCompoundTag("InfiTool").getInteger("Handle"); int binding = tags.getCompoundTag("InfiTool").getInteger("Accessory"); int extra = tags.getCompoundTag("InfiTool").getInteger("Extra"); String headName = getAbilityNameForType(head, 0); - if (!headName.equals("")) - list.add(getStyleForType(head) + headName); + if (!headName.equals("")) list.add(getStyleForType(head) + headName); String handleName = getBowstringName(handle); - if (!handleName.equals("") && handle != head) - list.add(handleName); + if (!handleName.equals("") && handle != head) list.add(handleName); - if (getPartAmount() >= 3) - { + if (getPartAmount() >= 3) { String bindingName = getAbilityNameForType(binding, 0); if (!bindingName.equals("") && binding != head && binding != handle) list.add(getStyleForType(binding) + bindingName); } - if (getPartAmount() >= 4) - { + if (getPartAmount() >= 4) { String extraName = getAbilityNameForType(extra, 0); if (!extraName.equals("") && extra != head && extra != handle && extra != binding) list.add(getStyleForType(extra) + extraName); @@ -172,41 +148,33 @@ else if (power > this.getMaxEnergyStored(stack) * 2 / 3) int unbreaking = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); String reinforced = getReinforcedName(head, handle, binding, extra, unbreaking); - if (!reinforced.equals("")) - list.add(reinforced); + if (!reinforced.equals("")) list.add(reinforced); boolean displayToolTips = true; int tipNum = 0; - while (displayToolTips) - { + while (displayToolTips) { tipNum++; String tooltip = "Tooltip" + tipNum; - if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) - { + if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) { String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); - if (!tipName.equals("")) - list.add(tipName); - } - else - displayToolTips = false; + if (!tipName.equals("")) list.add(tipName); + } else displayToolTips = false; } } } list.add(""); - list.add("\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + " " + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); - + list.add("\u00A79+" + tags.getCompoundTag("InfiTool").getInteger("Attack") + " " + + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); } - public String getBowstringName (int type) - { - switch (type) - { - case 0: - return ""; - case 1: - return "\u00A7bEnchanted"; - default: - return ""; + public String getBowstringName(int type) { + switch (type) { + case 0: + return ""; + case 1: + return "\u00A7bEnchanted"; + default: + return ""; } // return TConstructRegistry.getMaterial(type).ability(); } diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 2ec2fc08b23..e5c5c3ff9b6 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -6,102 +6,92 @@ import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; -public class Shovel extends HarvestTool -{ - public Shovel() - { +public class Shovel extends HarvestTool { + public Shovel() { super(2); this.setUnlocalizedName("InfiTool.Shovel"); } @Override - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return materials; } @Override - protected String getHarvestType () - { + protected String getHarvestType() { return "shovel"; } - static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + static Material[] materials = { + Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay + }; @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerTools.shovelHead; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return null; } @Override - public int getPartAmount () - { + public int getPartAmount() { return 2; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_shovel_head"; - case 1: - return "_shovel_head_broken"; - case 2: - return "_shovel_handle"; - default: - return ""; + public String getIconSuffix(int partType) { + switch (partType) { + case 0: + return "_shovel_head"; + case 1: + return "_shovel_head_broken"; + case 2: + return "_shovel_handle"; + default: + return ""; } } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_shovel_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "shovel"; } /* * @Override public Icon getIcon (ItemStack stack, int renderPass) { * NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - * + * * if (renderPass == 0) // Handle { return * (handleIcons.get(tags.getInteger("RenderHandle"))); } - * + * * if (renderPass == 1) // Head { if (tags.getBoolean("Broken")) return * (brokenHeadIcons.get(tags.getInteger("RenderHead"))); else return * (headIcons.get(tags.getInteger("RenderHead"))); } - * + * * if (renderPass == 2) { if (tags.hasKey("Effect1")) return * (effectIcons.get(tags.getInteger("Effect1"))); } - * + * * if (renderPass == 3) { if (tags.hasKey("Effect2")) return * (effectIcons.get(tags.getInteger("Effect2"))); } - * + * * if (renderPass == 4) { if (tags.hasKey("Effect3")) return * (effectIcons.get(tags.getInteger("Effect3"))); } - * + * * return TProxyClient.blankSprite; } */ } diff --git a/src/main/java/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java index ed1b2de9444..ed37b4051d4 100644 --- a/src/main/java/tconstruct/library/ActiveToolMod.java +++ b/src/main/java/tconstruct/library/ActiveToolMod.java @@ -7,62 +7,78 @@ import net.minecraft.world.World; import tconstruct.library.tools.ToolCore; -public class ActiveToolMod -{ +public class ActiveToolMod { /* Updating */ - public void updateTool (ToolCore tool, ItemStack stack, World world, Entity entity) - { - - } + public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity) {} /* Harvesting */ - public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity) - { + public boolean beforeBlockBreak(ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity) { return false; } @Deprecated - public boolean afterBlockBreak () // Unfinished, not called - { + public boolean afterBlockBreak() // Unfinished, not called + { return false; } - public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) - { - - } + public void afterBlockBreak( + ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) {} /* Attacking */ - public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public int baseAttackDamage( + int earlyModDamage, + int damage, + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { return earlyModDamage; } // Calculated after sprinting and enchant bonuses - public float knockback (float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public float knockback( + float modKnockback, + float currentKnockback, + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { return modKnockback; } - public int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public int attackDamage( + int modDamage, + int currentDamage, + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { return modDamage; } - public void lateAttackEntity () // Unfinished, not called - { - - } + public void lateAttackEntity() // Unfinished, not called + {} /* Damage tool */ - public boolean damageTool (ItemStack stack, int damage, EntityLivingBase entity) - { + public boolean damageTool(ItemStack stack, int damage, EntityLivingBase entity) { return false; } - public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public boolean doesCriticalHit( + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { return false; } } diff --git a/src/main/java/tconstruct/library/ItemBlocklike.java b/src/main/java/tconstruct/library/ItemBlocklike.java index 46375dbe620..4e479445cd2 100644 --- a/src/main/java/tconstruct/library/ItemBlocklike.java +++ b/src/main/java/tconstruct/library/ItemBlocklike.java @@ -1,5 +1,3 @@ package tconstruct.library; -public interface ItemBlocklike -{ -} +public interface ItemBlocklike {} diff --git a/src/main/java/tconstruct/library/SlimeBounceHandler.java b/src/main/java/tconstruct/library/SlimeBounceHandler.java index 2b34187d508..9b91df90a78 100644 --- a/src/main/java/tconstruct/library/SlimeBounceHandler.java +++ b/src/main/java/tconstruct/library/SlimeBounceHandler.java @@ -1,11 +1,9 @@ package tconstruct.library; -import java.util.IdentityHashMap; - -import javax.vecmath.Vector3d; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.util.IdentityHashMap; +import javax.vecmath.Vector3d; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -17,272 +15,272 @@ /** Logic for entities bouncing */ public class SlimeBounceHandler { - public static final float SQRT_2 = sqrt(2.0F); - private static final float[] SIN_TABLE = new float[65536]; - private static final double FRAC_BIAS; - private static final double[] ASINE_TAB; - private static final double[] COS_TAB; - public static final IdentityHashMap BOUNCING_ENTITIES = new IdentityHashMap(); + public static final float SQRT_2 = sqrt(2.0F); + private static final float[] SIN_TABLE = new float[65536]; + private static final double FRAC_BIAS; + private static final double[] ASINE_TAB; + private static final double[] COS_TAB; + public static final IdentityHashMap BOUNCING_ENTITIES = + new IdentityHashMap(); + + static { + for (int i = 0; i < 65536; ++i) { + SIN_TABLE[i] = (float) Math.sin(i * Math.PI * 2.0D / 65536.0D); + } + FRAC_BIAS = Double.longBitsToDouble(4805340802404319232L); + ASINE_TAB = new double[257]; + COS_TAB = new double[257]; + + for (int j = 0; j < 257; ++j) { + double d0 = j / 256.0D; + double d1 = Math.asin(d0); + COS_TAB[j] = Math.cos(d1); + ASINE_TAB[j] = d1; + } + } - static { - for (int i = 0; i < 65536; ++i) { - SIN_TABLE[i] = (float) Math.sin(i * Math.PI * 2.0D / 65536.0D); - } - FRAC_BIAS = Double.longBitsToDouble(4805340802404319232L); - ASINE_TAB = new double[257]; - COS_TAB = new double[257]; + private SlimeBounceHandler() { + TinkerGadgets.log.info("Created instance of Bounce Handler."); + } - for (int j = 0; j < 257; ++j) { - double d0 = j / 256.0D; - double d1 = Math.asin(d0); - COS_TAB[j] = Math.cos(d1); - ASINE_TAB[j] = d1; - } - } + /** Registers event handlers */ + public static void init() { + TinkerGadgets.log.info("Registering Bounce Handler."); + registerEvent(new SlimeBounceHandler()); + } - private SlimeBounceHandler() { - TinkerGadgets.log.info("Created instance of Bounce Handler."); - } + /** + * Preserves entity air momentum + * + * @param entity Entity to bounce + */ + public static void addBounceHandler(EntityLivingBase entity) { + addBounceHandler(entity, 0d); + } - /** Registers event handlers */ - public static void init() { - TinkerGadgets.log.info("Registering Bounce Handler."); - registerEvent(new SlimeBounceHandler()); - } + /** + * Causes the entity to bounce, needed because the fall event will reset motion + * afterwards + * + * @param entity Entity to bounce + * @param bounce Bounce amount + */ + public static void addBounceHandler(EntityLivingBase entity, double bounce) { + // no fake players PlayerTick event + if (entity instanceof FakePlayer) { + return; + } + // update bounce info + BounceInfo info = BOUNCING_ENTITIES.get(entity); + if (hasSlimeBoots(entity)) { + if (info == null) { + BOUNCING_ENTITIES.put(entity, new BounceInfo(entity, bounce)); + TinkerGadgets.log.info("Created new BounceInfo for " + entity.getCommandSenderName()); + } else if (bounce != 0) { + TinkerGadgets.log.info("Updating Bounce data?"); + // updated bounce if needed + info.bounce = bounce; + // add one to the tick as there is a 1 tick delay between falling and ticking + // for many entities + info.bounceTick = entity.ticksExisted + 1; - /** - * Preserves entity air momentum - * - * @param entity Entity to bounce - */ - public static void addBounceHandler(EntityLivingBase entity) { - addBounceHandler(entity, 0d); - } + info.lastMagSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; + info.lastAngle = atan2(entity.motionZ, entity.motionX); + } + } + } - /** - * Causes the entity to bounce, needed because the fall event will reset motion - * afterwards - * - * @param entity Entity to bounce - * @param bounce Bounce amount - */ - public static void addBounceHandler(EntityLivingBase entity, double bounce) { - // no fake players PlayerTick event - if (entity instanceof FakePlayer) { - return; - } - // update bounce info - BounceInfo info = BOUNCING_ENTITIES.get(entity); - if (hasSlimeBoots(entity)) { - if (info == null) { - BOUNCING_ENTITIES.put(entity, new BounceInfo(entity, bounce)); - TinkerGadgets.log.info("Created new BounceInfo for "+entity.getCommandSenderName()); - } else if (bounce != 0) { - TinkerGadgets.log.info("Updating Bounce data?"); - // updated bounce if needed - info.bounce = bounce; - // add one to the tick as there is a 1 tick delay between falling and ticking - // for many entities - info.bounceTick = entity.ticksExisted + 1; + public static void registerEvent(Object o) { + MinecraftForge.EVENT_BUS.register(o); + FMLCommonHandler.instance().bus().register(o); + } - info.lastMagSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; - info.lastAngle = atan2(entity.motionZ, entity.motionX); - } - } - } + /** Called on living tick to preserve momentum and bounce */ + @SubscribeEvent + public void onLivingTick(LivingUpdateEvent event) { + EntityLivingBase entity = event.entityLiving; + if (entity != null) { + BounceInfo info = BOUNCING_ENTITIES.get(entity); - public static void registerEvent(Object o){ - MinecraftForge.EVENT_BUS.register(o); - FMLCommonHandler.instance().bus().register(o); - } + // TinkerGadgets.log.info("Bounce Data valid? "+(info != null)); + // if we have info for this entity, time to work + if (info != null) { + // TinkerGadgets.log.info("Found Bounce Data in tick handler."); + // if flying, nothing to do + if (entity.isDead || entity.noClip) { + // TinkerGadgets.log.info("Removing Bounce Data."); + BOUNCING_ENTITIES.remove(entity); + return; + } + if (!hasSlimeBoots(entity)) { + // TinkerGadgets.log.info("Removing Bounce Data. No Boots."); + BOUNCING_ENTITIES.remove(entity); + return; + } - /** Called on living tick to preserve momentum and bounce */ - @SubscribeEvent - public void onLivingTick(LivingUpdateEvent event) { - EntityLivingBase entity = event.entityLiving; - if (entity != null) { - BounceInfo info = BOUNCING_ENTITIES.get(entity); + // if its the bounce tick, time to bounce. This is to circumvent the logic that + // resets y motion after landing + if (entity.ticksExisted == info.bounceTick) { + TinkerGadgets.log.info("Bounce Tick?"); + entity.setVelocity(entity.motionX, info.bounce, entity.motionZ); + info.bounceTick = 0; + } - //TinkerGadgets.log.info("Bounce Data valid? "+(info != null)); - // if we have info for this entity, time to work - if (info != null) { - //TinkerGadgets.log.info("Found Bounce Data in tick handler."); - // if flying, nothing to do - if (entity.isDead || entity.noClip) { - //TinkerGadgets.log.info("Removing Bounce Data."); - BOUNCING_ENTITIES.remove(entity); - return; - } - if (!hasSlimeBoots(entity)) { - //TinkerGadgets.log.info("Removing Bounce Data. No Boots."); - BOUNCING_ENTITIES.remove(entity); - return; - } + boolean isInAir = !entity.onGround && !entity.isInWater() && !entity.isOnLadder(); - // if its the bounce tick, time to bounce. This is to circumvent the logic that - // resets y motion after landing - if (entity.ticksExisted == info.bounceTick) { - TinkerGadgets.log.info("Bounce Tick?"); - entity.setVelocity(entity.motionX, info.bounce, entity.motionZ); - info.bounceTick = 0; - } + // TinkerGadgets.log.info("In Air? "+isInAir); + // preserve motion + if (isInAir && info.lastMagSq > 0) { + // figure out how much motion has reduced + double motionSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; + // if not moving, cancel velocity preserving in 5 ticks + if (motionSq == 0) { + if (info.stopMagTick == 0) { + info.stopMagTick = entity.ticksExisted + 5; + } else if (entity.ticksExisted > info.stopMagTick) { + info.lastMagSq = 0; + } + } else if (motionSq < info.lastMagSq) { + info.stopMagTick = 0; + // preserve 95% of former speed + double boost = Math.sqrt(info.lastMagSq / motionSq) * 0.95f; + if (boost > 1) { + entity.setVelocity(entity.motionX * boost, entity.motionY, entity.motionZ * boost); + entity.isAirBorne = true; + info.lastMagSq = info.lastMagSq * 0.95f * 0.95f; + // play sound if we had a big angle change + double newAngle = atan2(entity.motionZ, entity.motionX); + if (Math.abs(newAngle - info.lastAngle) > 1) { + entity.playSound("mob.slime.small", 1.0f, 1.0f); + } + info.lastAngle = newAngle; + } else { + info.lastMagSq = motionSq; + info.lastAngle = atan2(entity.motionZ, entity.motionX); + } + } + } + // TinkerGadgets.log.info("Did things? 1"); - boolean isInAir = !entity.onGround && !entity.isInWater() && !entity.isOnLadder(); + // timing the effect out + if (info.wasInAir && !isInAir) { + if (info.endHandler == 0) { + info.endHandler = entity.ticksExisted + 5; + } else if (entity.ticksExisted > info.endHandler) { + // TinkerGadgets.log.info("Removing Bounce Data for "+entity.getCommandSenderName()); + BOUNCING_ENTITIES.remove(entity); + } + } else { + info.endHandler = 0; + info.wasInAir = true; + } + // TinkerGadgets.log.info("Did things? 2"); + } else { + // TinkerGadgets.log.info("Bad Bounce Data."); + } + } + } - //TinkerGadgets.log.info("In Air? "+isInAir); - // preserve motion - if (isInAir && info.lastMagSq > 0) { - // figure out how much motion has reduced - double motionSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; - // if not moving, cancel velocity preserving in 5 ticks - if (motionSq == 0) { - if (info.stopMagTick == 0) { - info.stopMagTick = entity.ticksExisted + 5; - } else if (entity.ticksExisted > info.stopMagTick) { - info.lastMagSq = 0; - } - } else if (motionSq < info.lastMagSq) { - info.stopMagTick = 0; - // preserve 95% of former speed - double boost = Math.sqrt(info.lastMagSq / motionSq) * 0.95f; - if (boost > 1) { - entity.setVelocity(entity.motionX * boost, entity.motionY, entity.motionZ * boost); - entity.isAirBorne = true; - info.lastMagSq = info.lastMagSq * 0.95f * 0.95f; - // play sound if we had a big angle change - double newAngle = atan2(entity.motionZ, entity.motionX); - if (Math.abs(newAngle - info.lastAngle) > 1) { - entity.playSound("mob.slime.small", 1.0f, 1.0f); - } - info.lastAngle = newAngle; - } else { - info.lastMagSq = motionSq; - info.lastAngle = atan2(entity.motionZ, entity.motionX); - } - } - } - //TinkerGadgets.log.info("Did things? 1"); + public static Vector3d getMotion(EntityLivingBase aEntity) { + return new Vector3d(aEntity.motionX, aEntity.motionY, aEntity.motionZ); + } - // timing the effect out - if (info.wasInAir && !isInAir) { - if (info.endHandler == 0) { - info.endHandler = entity.ticksExisted + 5; - } else if (entity.ticksExisted > info.endHandler) { - //TinkerGadgets.log.info("Removing Bounce Data for "+entity.getCommandSenderName()); - BOUNCING_ENTITIES.remove(entity); - } - } else { - info.endHandler = 0; - info.wasInAir = true; - } - //TinkerGadgets.log.info("Did things? 2"); - } - else { - //TinkerGadgets.log.info("Bad Bounce Data."); - } - } - } - - public static Vector3d getMotion(EntityLivingBase aEntity) { - return new Vector3d(aEntity.motionX, aEntity.motionY, aEntity.motionZ); - } - - public static boolean hasSlimeBoots(EntityLivingBase entity) { - if (entity != null) { - for (int i = 1; i < 5; i++) { - ItemStack aBoots = entity.getEquipmentInSlot(i); - if (aBoots != null && aBoots.getItem() instanceof ItemSlimeBoots) { - //TinkerGadgets.log.info("Found boots in slot "+i); - return true; - } - } - } - return false; - } + public static boolean hasSlimeBoots(EntityLivingBase entity) { + if (entity != null) { + for (int i = 1; i < 5; i++) { + ItemStack aBoots = entity.getEquipmentInSlot(i); + if (aBoots != null && aBoots.getItem() instanceof ItemSlimeBoots) { + // TinkerGadgets.log.info("Found boots in slot "+i); + return true; + } + } + } + return false; + } - public static float sqrt(float value) { - return (float) Math.sqrt(value); - } + public static float sqrt(float value) { + return (float) Math.sqrt(value); + } - public static double atan2(double aArg1, double aArg2) { - double d0 = aArg2 * aArg2 + aArg1 * aArg1; - if (Double.isNaN(d0)) { - return Double.NaN; - } else { - boolean flag = aArg1 < 0.0D; - if (flag) { - aArg1 = -aArg1; - } - boolean flag1 = aArg2 < 0.0D; - if (flag1) { - aArg2 = -aArg2; - } - boolean flag2 = aArg1 > aArg2; - if (flag2) { - double d1 = aArg2; - aArg2 = aArg1; - aArg1 = d1; - } - double d9 = fastInvSqrt(d0); - aArg2 = aArg2 * d9; - aArg1 = aArg1 * d9; - double d2 = FRAC_BIAS + aArg1; - int i = (int) Double.doubleToRawLongBits(d2); - double d3 = ASINE_TAB[i]; - double d4 = COS_TAB[i]; - double d5 = d2 - FRAC_BIAS; - double d6 = aArg1 * d4 - aArg2 * d5; - double d7 = (6.0D + d6 * d6) * d6 * 0.16666666666666666D; - double d8 = d3 + d7; - if (flag2) { - d8 = (Math.PI / 2D) - d8; - } - if (flag1) { - d8 = Math.PI - d8; - } - if (flag) { - d8 = -d8; - } - return d8; - } - } + public static double atan2(double aArg1, double aArg2) { + double d0 = aArg2 * aArg2 + aArg1 * aArg1; + if (Double.isNaN(d0)) { + return Double.NaN; + } else { + boolean flag = aArg1 < 0.0D; + if (flag) { + aArg1 = -aArg1; + } + boolean flag1 = aArg2 < 0.0D; + if (flag1) { + aArg2 = -aArg2; + } + boolean flag2 = aArg1 > aArg2; + if (flag2) { + double d1 = aArg2; + aArg2 = aArg1; + aArg1 = d1; + } + double d9 = fastInvSqrt(d0); + aArg2 = aArg2 * d9; + aArg1 = aArg1 * d9; + double d2 = FRAC_BIAS + aArg1; + int i = (int) Double.doubleToRawLongBits(d2); + double d3 = ASINE_TAB[i]; + double d4 = COS_TAB[i]; + double d5 = d2 - FRAC_BIAS; + double d6 = aArg1 * d4 - aArg2 * d5; + double d7 = (6.0D + d6 * d6) * d6 * 0.16666666666666666D; + double d8 = d3 + d7; + if (flag2) { + d8 = (Math.PI / 2D) - d8; + } + if (flag1) { + d8 = Math.PI - d8; + } + if (flag) { + d8 = -d8; + } + return d8; + } + } - public static double fastInvSqrt(double aArg) { - double d0 = 0.5D * aArg; - long i = Double.doubleToRawLongBits(aArg); - i = 6910469410427058090L - (i >> 1); - aArg = Double.longBitsToDouble(i); - aArg = aArg * (1.5D - d0 * aArg * aArg); - return aArg; - } + public static double fastInvSqrt(double aArg) { + double d0 = 0.5D * aArg; + long i = Double.doubleToRawLongBits(aArg); + i = 6910469410427058090L - (i >> 1); + aArg = Double.longBitsToDouble(i); + aArg = aArg * (1.5D - d0 * aArg * aArg); + return aArg; + } - /** Data class to keep track of bouncing info for an entity */ - private static class BounceInfo { - /** Velocity the entity should have, unused if 0 */ - private double bounce; - /** Time to update the entities velocity */ - private int bounceTick; - /** Tick to stop entity magnitude changes */ - private int stopMagTick; - /** Magnitude of the X/Z motion last tick */ - private double lastMagSq; - /** If true, the entity was in air last tick */ - private boolean wasInAir = false; - /** Time when motion should stop */ - private int endHandler = 0; - /** Last angle of motion, used for sound effects */ - private double lastAngle; + /** Data class to keep track of bouncing info for an entity */ + private static class BounceInfo { + /** Velocity the entity should have, unused if 0 */ + private double bounce; + /** Time to update the entities velocity */ + private int bounceTick; + /** Tick to stop entity magnitude changes */ + private int stopMagTick; + /** Magnitude of the X/Z motion last tick */ + private double lastMagSq; + /** If true, the entity was in air last tick */ + private boolean wasInAir = false; + /** Time when motion should stop */ + private int endHandler = 0; + /** Last angle of motion, used for sound effects */ + private double lastAngle; - public BounceInfo(EntityLivingBase entity, double bounce) { - this.bounce = bounce; - if (bounce != 0) { - // add one to the tick as there is a 1 tick delay between falling and ticking - // for many entities - this.bounceTick = entity.ticksExisted + 1; - } else { - this.bounceTick = 0; - } - this.lastMagSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; - } - } + public BounceInfo(EntityLivingBase entity, double bounce) { + this.bounce = bounce; + if (bounce != 0) { + // add one to the tick as there is a 1 tick delay between falling and ticking + // for many entities + this.bounceTick = entity.ticksExisted + 1; + } else { + this.bounceTick = 0; + } + this.lastMagSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; + } + } } diff --git a/src/main/java/tconstruct/library/TConstructCreativeTab.java b/src/main/java/tconstruct/library/TConstructCreativeTab.java index 8cda6165c42..699393f5e9b 100644 --- a/src/main/java/tconstruct/library/TConstructCreativeTab.java +++ b/src/main/java/tconstruct/library/TConstructCreativeTab.java @@ -3,27 +3,22 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; -public class TConstructCreativeTab extends CreativeTabs -{ +public class TConstructCreativeTab extends CreativeTabs { ItemStack display; - public TConstructCreativeTab(String label) - { + public TConstructCreativeTab(String label) { super(label); } - public void init (ItemStack stack) - { + public void init(ItemStack stack) { display = stack; } - public ItemStack getIconItemStack () - { + public ItemStack getIconItemStack() { return display; } - public Item getTabIconItem () - { + public Item getTabIconItem() { return display.getItem(); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index a16c76c1af1..f0071ba95ab 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -11,12 +11,10 @@ /** * A registry to store any relevant API work - * + * * @author mDiyo */ - -public class TConstructRegistry -{ +public class TConstructRegistry { public static TConstructRegistry instance = new TConstructRegistry(); public static Logger logger = LogManager.getLogger("TCon-API"); @@ -34,13 +32,13 @@ public class TConstructRegistry /** * A directory of crafting items and tools used by the mod. - * + * * Tools: pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, * cutlass frypan, battlesign, mattock, chisel lumberaxe, cleaver, scythe, * excavator, hammer, battleaxe - * + * * Patterns: blankPattern, woodPattern, metalPattern, clayPattern - * + * * Tool crafting parts: toolRod, toolShard, binding, toughBinding, toughRod, * heavyPlate pickaxeHead, shovelhead, hatchetHead, swordBlade, wideguard, * handGuard, crossbar, knifeBlade, fullGuard, frypanHead, signHead, @@ -51,42 +49,36 @@ public class TConstructRegistry /** * Adds an item to the directory - * + * * @param name * Associates the name with the stack * @param itemstack * The stack to add to the directory */ - - public static void addItemToDirectory (String name, Item itemstack) - { + public static void addItemToDirectory(String name, Item itemstack) { Item add = itemDirectory.get(name); - if (add != null) - logger.warn(name + " is already present in the Item directory"); + if (add != null) logger.warn(name + " is already present in the Item directory"); itemDirectory.put(name, itemstack); } /** * Retrieves an itemstack from the directory - * + * * @param name * The name of the item to get * @return Item associated with the name, or null if not present. */ - - public static Item getItem (String name) - { + public static Item getItem(String name) { Item ret = itemDirectory.get(name); - if (ret == null) - logger.warn("Could not find " + name + " in the Item directory"); + if (ret == null) logger.warn("Could not find " + name + " in the Item directory"); return ret; } /** * A directory of ItemStacks. Contains mostly crafting items - * + * * Materials: paperStack, greenSlimeCrystal, blueSlimeCrystal, searedBrick, * mossBall, lavaCrystal, necroticBone, silkyCloth, silkyJewel ingotCobalt, * ingotArdite, ingotManyullyn, ingotCopper, ingotTin, ingotAluminum, @@ -95,7 +87,7 @@ public static Item getItem (String name) * nuggetSilver, nuggetAluminumBrass oreberryIron, oreberryGold, * oreberryCopper, oreberryTin, oreberryTin, oreberrySilver, diamondApple, * blueSlimeFood, canisterEmpty, miniRedHeart, canisterRedHeart - * + * * Patterns - These have a suffix of Pattern or Cast. ex: hatchetHeadPattern * ingot, toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, * wideGuard, handGuard, crossbar, binding, frypanHead, signHead, @@ -107,35 +99,29 @@ public static Item getItem (String name) /** * Adds an itemstack to the directory - * + * * @param name * Associates the name with the stack * @param itemstack * The stack to add to the directory */ - - public static void addItemStackToDirectory (String name, ItemStack itemstack) - { + public static void addItemStackToDirectory(String name, ItemStack itemstack) { ItemStack add = itemstackDirectory.get(name); - if (add != null) - logger.warn(name + " is already present in the ItemStack directory"); + if (add != null) logger.warn(name + " is already present in the ItemStack directory"); itemstackDirectory.put(name, itemstack); } /** * Retrieves an itemstack from the directory - * + * * @param name * The name of the item to get * @return Item associated with the name, or null if not present. */ - - public static ItemStack getItemStack (String name) - { + public static ItemStack getItemStack(String name) { ItemStack ret = itemstackDirectory.get(name); - if (ret == null) - logger.warn("Could not find " + name + " in the ItemStack directory"); + if (ret == null) logger.warn("Could not find " + name + " in the ItemStack directory"); return ret; } @@ -152,7 +138,7 @@ public static ItemStack getItemStack (String name) /** * Maps an item and a material ID to an output part - * + * * @param woodPattern * ID to check against * @param patternMeta @@ -162,16 +148,13 @@ public static ItemStack getItemStack (String name) * @param output * The resulting part */ - public static void addPartMapping (Item woodPattern, int patternMeta, int materialID, ItemStack output) - { + public static void addPartMapping(Item woodPattern, int patternMeta, int materialID, ItemStack output) { patternPartMapping.put(Arrays.asList(woodPattern, patternMeta, materialID), output); } - public static ItemStack getPartMapping (Item item, int metadata, int materialID) - { + public static ItemStack getPartMapping(Item item, int metadata, int materialID) { ItemStack stack = patternPartMapping.get(Arrays.asList(item, metadata, materialID)); - if (stack != null) - return stack.copy(); + if (stack != null) return stack.copy(); return null; } @@ -179,23 +162,19 @@ public static ItemStack getPartMapping (Item item, int metadata, int materialID) /** * Internal tool mapping, used for adding textures - * + * * @param tool */ - - public static void addToolMapping (ToolCore tool) - { + public static void addToolMapping(ToolCore tool) { tools.add(tool); } /** * Internal tool mapping, used for adding textures - * + * * @return List of tools */ - - public static ArrayList getToolMapping () - { + public static ArrayList getToolMapping() { return tools; } @@ -203,18 +182,16 @@ public static ArrayList getToolMapping () * Registers a tool to its crafting parts. If an output is registered * multiple times the parts are added to the recipe's input list Valid part * amounts are 2, 3, and 4. - * + * * @see ToolBuilder * @param output * The ToolCore to craft * @param parts * Pieces to make the tool with */ - public static void addToolRecipe (ToolCore output, Item... parts) - { + public static void addToolRecipe(ToolCore output, Item... parts) { ToolBuilder tb = ToolBuilder.instance; - if (parts.length < 2 || parts.length > 4) - logger.warn("Wrong amount of items to craft into a tool"); + if (parts.length < 2 || parts.length > 4) logger.warn("Wrong amount of items to craft into a tool"); tb.addToolRecipe(output, parts); } @@ -225,25 +202,21 @@ public static void addToolRecipe (ToolCore output, Item... parts) public static List defaultToolPartMaterials = new LinkedList(); public static List defaultShardMaterials = new LinkedList(); - public static void addDefaultToolPartMaterial(int materialID) - { - if(!toolMaterials.containsKey(materialID)) + public static void addDefaultToolPartMaterial(int materialID) { + if (!toolMaterials.containsKey(materialID)) logger.error("[TCon API] Can't add default toolpart: Material ID " + materialID + " is unknown."); - else - defaultToolPartMaterials.add(materialID); + else defaultToolPartMaterials.add(materialID); } - public static void addDefaultShardMaterial(int materialID) - { - if(!toolMaterials.containsKey(materialID)) + public static void addDefaultShardMaterial(int materialID) { + if (!toolMaterials.containsKey(materialID)) logger.error("[TCon API] Can't add default shard: Material ID " + materialID + " is unknown."); - else - defaultShardMaterials.add(materialID); + else defaultShardMaterials.add(materialID); } /** * Adds a tool material to the registry - * + * * @param materialID * Unique ID, stored for each part * @param materialName @@ -266,18 +239,36 @@ public static void addDefaultShardMaterial(int materialID) * Amount of Stonebound to put on the tool. Negative numbers are * Spiny. */ - - public static void addToolMaterial (int materialID, String materialName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, int primaryColor) - { + public static void addToolMaterial( + int materialID, + String materialName, + int harvestLevel, + int durability, + int miningspeed, + int attack, + float handleModifier, + int reinforced, + float stonebound, + String style, + int primaryColor) { ToolMaterial mat = toolMaterials.get(materialID); - if (mat == null) - { - mat = new ToolMaterial(materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, primaryColor); + if (mat == null) { + mat = new ToolMaterial( + materialName, + harvestLevel, + durability, + miningspeed, + attack, + handleModifier, + reinforced, + stonebound, + style, + primaryColor); toolMaterials.put(materialID, mat); toolMaterialStrings.put(materialName, mat); - } - else - throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + } else + throw new IllegalArgumentException( + "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); } /** @@ -307,74 +298,153 @@ public static void addToolMaterial (int materialID, String materialName, int har * Amount of Stonebound to put on the tool. Negative numbers are * Spiny. */ - public static void addToolMaterial (int materialID, String materialName, String localizationName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, int primaryColor) - { + public static void addToolMaterial( + int materialID, + String materialName, + String localizationName, + int harvestLevel, + int durability, + int miningspeed, + int attack, + float handleModifier, + int reinforced, + float stonebound, + String style, + int primaryColor) { ToolMaterial mat = toolMaterials.get(materialID); - if (mat == null) - { - mat = new ToolMaterial(materialName, localizationName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, primaryColor); + if (mat == null) { + mat = new ToolMaterial( + materialName, + localizationName, + harvestLevel, + durability, + miningspeed, + attack, + handleModifier, + reinforced, + stonebound, + style, + primaryColor); toolMaterials.put(materialID, mat); toolMaterialStrings.put(materialName, mat); - } - else - throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + } else + throw new IllegalArgumentException( + "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); } @Deprecated - public static void addToolMaterial (int materialID, String materialName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style) - { - logger.warn("[TCon API] Using deprecated addToolMaterial with no primary color. A fallback of white will be used."); - addToolMaterial(materialID, materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, 0xFFFFFF); + public static void addToolMaterial( + int materialID, + String materialName, + int harvestLevel, + int durability, + int miningspeed, + int attack, + float handleModifier, + int reinforced, + float stonebound, + String style) { + logger.warn( + "[TCon API] Using deprecated addToolMaterial with no primary color. A fallback of white will be used."); + addToolMaterial( + materialID, + materialName, + harvestLevel, + durability, + miningspeed, + attack, + handleModifier, + reinforced, + stonebound, + style, + 0xFFFFFF); } @Deprecated - public static void addToolMaterial (int materialID, String materialName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, String ability) - { - logger.warn("[TCon API] Using deprecated addToolMaterial with ability name. ability will be ignored, use languages files for that."); - addToolMaterial(materialID, materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style); + public static void addToolMaterial( + int materialID, + String materialName, + int harvestLevel, + int durability, + int miningspeed, + int attack, + float handleModifier, + int reinforced, + float stonebound, + String style, + String ability) { + logger.warn( + "[TCon API] Using deprecated addToolMaterial with ability name. ability will be ignored, use languages files for that."); + addToolMaterial( + materialID, + materialName, + harvestLevel, + durability, + miningspeed, + attack, + handleModifier, + reinforced, + stonebound, + style); } @Deprecated - public static void addToolMaterial (int materialID, String materialName, String displayName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, String ability) - { - logger.warn("[TCon API] Using deprecated addToolMaterial with display and ability name. displayName and ability will be ignored, use languages files for that."); - addToolMaterial(materialID, materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style); + public static void addToolMaterial( + int materialID, + String materialName, + String displayName, + int harvestLevel, + int durability, + int miningspeed, + int attack, + float handleModifier, + int reinforced, + float stonebound, + String style, + String ability) { + logger.warn( + "[TCon API] Using deprecated addToolMaterial with display and ability name. displayName and ability will be ignored, use languages files for that."); + addToolMaterial( + materialID, + materialName, + harvestLevel, + durability, + miningspeed, + attack, + handleModifier, + reinforced, + stonebound, + style); } /** * Adds a tool material to the registry - * + * * @param materialID * Unique ID, stored for each part * @param material * Complete tool material to add. Uses the name in the material * for lookup purposes. */ - - public static void addtoolMaterial (int materialID, ToolMaterial material) - { + public static void addtoolMaterial(int materialID, ToolMaterial material) { ToolMaterial mat = toolMaterials.get(materialID); - if (mat == null) - { + if (mat == null) { toolMaterials.put(materialID, material); toolMaterialStrings.put(material.name(), material); - } - else - throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); + } else + throw new IllegalArgumentException( + "[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName); } /** * Looks up a tool material by ID - * + * * @param key * The ID to look up * @return Tool Material */ - - public static ToolMaterial getMaterial (int key) - { - if (toolMaterials.containsKey(key)) - { + public static ToolMaterial getMaterial(int key) { + if (toolMaterials.containsKey(key)) { return (toolMaterials.get(key)); } @@ -385,14 +455,12 @@ public static ToolMaterial getMaterial (int key) /** * Looks up a tool material by name - * + * * @param key * the name to look up * @return Tool Material */ - - public static ToolMaterial getMaterial (String key) - { + public static ToolMaterial getMaterial(String key) { return (toolMaterialStrings.get(key)); } @@ -400,115 +468,123 @@ public static ToolMaterial getMaterial (String key) public static HashMap bowMaterials = new HashMap(40); @Deprecated - public static void addBowMaterial (int materialID, int durability, int drawSpeed, float speedMax) - { + public static void addBowMaterial(int materialID, int durability, int drawSpeed, float speedMax) { addBowMaterial(materialID, drawSpeed, speedMax); } - public static void addBowMaterial (int materialID, int drawSpeed, float speedMax) - { + public static void addBowMaterial(int materialID, int drawSpeed, float speedMax) { BowMaterial mat = bowMaterials.get(materialID); - if (mat == null) - { + if (mat == null) { mat = new BowMaterial(drawSpeed, speedMax); bowMaterials.put(materialID, mat); - } - else - throw new IllegalArgumentException("[TCon API] Bow Material ID " + materialID + " is already occupied"); + } else throw new IllegalArgumentException("[TCon API] Bow Material ID " + materialID + " is already occupied"); } - public static boolean validBowMaterial (int materialID) - { + public static boolean validBowMaterial(int materialID) { return bowMaterials.containsKey(materialID); } - public static BowMaterial getBowMaterial (int materialID) - { + public static BowMaterial getBowMaterial(int materialID) { return bowMaterials.get(materialID); } public static HashMap arrowMaterials = new HashMap(40); @Deprecated - public static void addArrowMaterial (int materialID, float mass, float breakChance, float accuracy) - { + public static void addArrowMaterial(int materialID, float mass, float breakChance, float accuracy) { addArrowMaterial(materialID, mass, breakChance); } - public static void addArrowMaterial (int materialID, float mass, float breakChance) - { + public static void addArrowMaterial(int materialID, float mass, float breakChance) { ArrowMaterial mat = arrowMaterials.get(materialID); - if (mat == null) - { + if (mat == null) { mat = new ArrowMaterial(mass, breakChance); arrowMaterials.put(materialID, mat); - } - else + } else throw new IllegalArgumentException("[TCon API] Arrow Material ID " + materialID + " is already occupied"); } - public static boolean validArrowMaterial (int materialID) - { + public static boolean validArrowMaterial(int materialID) { return arrowMaterials.containsKey(materialID); } - public static ArrowMaterial getArrowMaterial (int materialID) - { + public static ArrowMaterial getArrowMaterial(int materialID) { return arrowMaterials.get(materialID); } // Custom materials - bowstrings, fletching, etc public static ArrayList customMaterials = new ArrayList(); - public static void addCustomMaterial (CustomMaterial mat) - { - if (mat != null) - customMaterials.add(mat); - } - - - public static void addBowstringMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed, int color) - { - BowstringMaterial mat = new BowstringMaterial(materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed, color); + public static void addCustomMaterial(CustomMaterial mat) { + if (mat != null) customMaterials.add(mat); + } + + public static void addBowstringMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingMaterial, + float durability, + float drawSpeed, + float flightSpeed, + int color) { + BowstringMaterial mat = new BowstringMaterial( + materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed, color); customMaterials.add(mat); } - public static void addFletchingMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float accuracy, float breakChance, float durabilityModifier, int color) - { - FletchingMaterial mat = new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance, durabilityModifier, color); + public static void addFletchingMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingMaterial, + float accuracy, + float breakChance, + float durabilityModifier, + int color) { + FletchingMaterial mat = new FletchingMaterial( + materialID, value, input, craftingMaterial, accuracy, breakChance, durabilityModifier, color); customMaterials.add(mat); } @Deprecated - public static void addBowstringMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed) - { - BowstringMaterial mat = new BowstringMaterial(materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed); + public static void addBowstringMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingMaterial, + float durability, + float drawSpeed, + float flightSpeed) { + BowstringMaterial mat = + new BowstringMaterial(materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed); customMaterials.add(mat); } @Deprecated - public static void addFletchingMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float accuracy, float breakChance, float mass) - { - FletchingMaterial mat = new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance, mass); + public static void addFletchingMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingMaterial, + float accuracy, + float breakChance, + float mass) { + FletchingMaterial mat = + new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance, mass); customMaterials.add(mat); } - public static CustomMaterial getCustomMaterial (int materialID, Class clazz) - { - for (CustomMaterial mat : customMaterials) - { - if (mat.getClass().equals(clazz) && mat.materialID == materialID) - return mat; + public static CustomMaterial getCustomMaterial(int materialID, Class clazz) { + for (CustomMaterial mat : customMaterials) { + if (mat.getClass().equals(clazz) && mat.materialID == materialID) return mat; } return null; } - public static CustomMaterial getCustomMaterial (ItemStack input, Class clazz) - { - for (CustomMaterial mat : customMaterials) - { - if (mat.getClass().equals(clazz) && mat.matches(input)) - return mat; + public static CustomMaterial getCustomMaterial(ItemStack input, Class clazz) { + for (CustomMaterial mat : customMaterials) { + if (mat.getClass().equals(clazz) && mat.matches(input)) return mat; } return null; } @@ -522,76 +598,61 @@ public static CustomMaterial getCustomMaterial (ItemStack input, Class activeModifiers = new ArrayList(); public static LinkedList activeArmorModifiers = new LinkedList(); - public static void registerActiveToolMod (ActiveToolMod mod) - { + public static void registerActiveToolMod(ActiveToolMod mod) { activeModifiers.add(mod); } - public static void registerActiveArmorMod (ActiveArmorMod mod) - { + public static void registerActiveArmorMod(ActiveArmorMod mod) { activeArmorModifiers.add(mod); } diff --git a/src/main/java/tconstruct/library/accessory/AccessoryCore.java b/src/main/java/tconstruct/library/accessory/AccessoryCore.java index 346c7f49259..c20764e753b 100644 --- a/src/main/java/tconstruct/library/accessory/AccessoryCore.java +++ b/src/main/java/tconstruct/library/accessory/AccessoryCore.java @@ -12,15 +12,13 @@ import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; -public abstract class AccessoryCore extends Item implements IAccessory, IModifyable -{ +public abstract class AccessoryCore extends Item implements IAccessory, IModifyable { /** * Override getArmorModel() to have render on the player. */ protected String texture; - public AccessoryCore(String texture) - { + public AccessoryCore(String texture) { super(); this.setCreativeTab(TConstructRegistry.equipableTab); this.setMaxStackSize(1); @@ -28,22 +26,19 @@ public AccessoryCore(String texture) } @Override - public String getBaseTagName () - { + public String getBaseTagName() { return "TinkerAccessory"; } @Override - public String getModifyType () - { + public String getModifyType() { return "Accessory"; } - final static String[] traits = new String[] { "accessory" }; + static final String[] traits = new String[] {"accessory"}; @Override - public String[] getTraits () - { + public String[] getTraits() { return traits; } @@ -61,23 +56,21 @@ public String[] getTraits () @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item par1, CreativeTabs par2CreativeTabs, List par3List) - { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(getDefaultItem()); } - public ItemStack getDefaultItem () - { + public ItemStack getDefaultItem() { ItemStack gear = new ItemStack(this, 1, 0); NBTTagCompound itemTag = new NBTTagCompound(); int baseDurability = 500; - itemTag.setInteger("Damage", 0); //Damage is damage to the tool + itemTag.setInteger("Damage", 0); // Damage is damage to the tool itemTag.setInteger("TotalDurability", baseDurability); itemTag.setInteger("BaseDurability", baseDurability); - itemTag.setInteger("BonusDurability", 0); //Modifier - itemTag.setFloat("ModDurability", 0f); //Modifier + itemTag.setInteger("BonusDurability", 0); // Modifier + itemTag.setFloat("ModDurability", 0f); // Modifier itemTag.setInteger("Modifiers", 5); itemTag.setBoolean("Broken", false); itemTag.setBoolean("Built", true); @@ -95,56 +88,44 @@ public ItemStack getDefaultItem () @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { itemIcon = iconRegister.registerIcon("tinker:" + texture); registerModifiers(iconRegister); } @SideOnly(Side.CLIENT) - protected void registerModifiers (IIconRegister iconRegister) - { - } + protected void registerModifiers(IIconRegister iconRegister) {} @SideOnly(Side.CLIENT) @Override - public boolean requiresMultipleRenderPasses () - { + public boolean requiresMultipleRenderPasses() { return true; } @SideOnly(Side.CLIENT) @Override - public int getRenderPasses (int metadata) - { + public int getRenderPasses(int metadata) { return 4; } @SideOnly(Side.CLIENT) - public boolean hasEffect (ItemStack par1ItemStack) - { + public boolean hasEffect(ItemStack par1ItemStack) { return false; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (ItemStack stack, int renderPass) - { - if (renderPass > 0) - { - if (stack.hasTagCompound()) - { + public IIcon getIcon(ItemStack stack, int renderPass) { + if (renderPass > 0) { + if (stack.hasTagCompound()) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("TinkerAccessory"); - if (renderPass == 1 && tags.hasKey("Effect1")) - { + if (renderPass == 1 && tags.hasKey("Effect1")) { return modifiers[tags.getInteger("Effect1")]; } - if (renderPass == 2 && tags.hasKey("Effect2")) - { + if (renderPass == 2 && tags.hasKey("Effect2")) { return modifiers[tags.getInteger("Effect2")]; } - if (renderPass == 3 && tags.hasKey("Effect3")) - { + if (renderPass == 3 && tags.hasKey("Effect3")) { return modifiers[tags.getInteger("Effect3")]; } } @@ -158,34 +139,24 @@ public IIcon getIcon (ItemStack stack, int renderPass) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey(getBaseTagName())) - { + if (tags.hasKey(getBaseTagName())) { tags = stack.getTagCompound().getCompoundTag(getBaseTagName()); boolean broken = tags.getBoolean("Broken"); - if (broken) - list.add("\u00A7oBroken"); - else - { + if (broken) list.add("\u00A7oBroken"); + else { boolean displayToolTips = true; int tipNum = 0; - while (displayToolTips) - { + while (displayToolTips) { tipNum++; String tooltip = "Tooltip" + tipNum; - if (tags.hasKey(tooltip)) - { + if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); - if (!tipName.equals("")) - list.add(tipName); - } - else - displayToolTips = false; + if (!tipName.equals("")) list.add(tipName); + } else displayToolTips = false; } } } diff --git a/src/main/java/tconstruct/library/accessory/IAccessory.java b/src/main/java/tconstruct/library/accessory/IAccessory.java index 0a59c72666f..462423e5cc7 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessory.java +++ b/src/main/java/tconstruct/library/accessory/IAccessory.java @@ -2,13 +2,12 @@ import net.minecraft.item.ItemStack; -public interface IAccessory -{ +public interface IAccessory { /** Accessory slots are not the same as armor slots! - * + * * @param item Instance of the item * @param slot Accessory slot * @return Whether the accessory can be inserted into the slot */ - public boolean canEquipAccessory (ItemStack item, int slot); + public boolean canEquipAccessory(ItemStack item, int slot); } diff --git a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java index e41c774ca70..69cc998ecd8 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java +++ b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java @@ -5,16 +5,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -public interface IAccessoryModel -{ +public interface IAccessoryModel { /** Similar to how armor is rendered. - * + * * @param stack * @param entity * @param slot * @return Resource location of the texture. Return null for none */ - @SideOnly(Side.CLIENT) - public ResourceLocation getWearbleTexture (Entity entity, ItemStack stack, int slot); + public ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot); } diff --git a/src/main/java/tconstruct/library/accessory/IHealthAccessory.java b/src/main/java/tconstruct/library/accessory/IHealthAccessory.java index c96e5a6cf47..617c7687572 100644 --- a/src/main/java/tconstruct/library/accessory/IHealthAccessory.java +++ b/src/main/java/tconstruct/library/accessory/IHealthAccessory.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemStack; -public interface IHealthAccessory extends IAccessory -{ - public int getHealthBoost (ItemStack item); +public interface IHealthAccessory extends IAccessory { + public int getHealthBoost(ItemStack item); } diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index ccf143caaa6..af08f0fe93e 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -20,8 +20,7 @@ import tconstruct.library.tools.ToolCore; import tconstruct.tools.entity.FancyEntityItem; -public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IModifyable -{ +public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IModifyable { public final ArmorPart armorPart; private static final IBehaviorDispenseItem dispenserBehavior = new BehaviorDispenseArmorCopy(); public final int baseProtection; @@ -29,8 +28,7 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod protected final String textureFolder; protected final String textureName; - public ArmorCore(int baseProtection, ArmorPart part, String type, String textureFolder, String textureName) - { + public ArmorCore(int baseProtection, ArmorPart part, String type, String textureFolder, String textureName) { super(ArmorMaterial.CHAIN, 0, part.getPartId()); this.maxStackSize = 1; this.setMaxDamage(100); @@ -43,46 +41,42 @@ public ArmorCore(int baseProtection, ArmorPart part, String type, String texture this.setCreativeTab(TConstructRegistry.equipableTab); } - public ArmorCore(int baseProtection, ArmorPart part, String type, String textureName) - { + public ArmorCore(int baseProtection, ArmorPart part, String type, String textureName) { this(baseProtection, part, type, "armor", textureName); } - //Temporary? - public abstract ItemStack getRepairMaterial (ItemStack input); + // Temporary? + public abstract ItemStack getRepairMaterial(ItemStack input); - public String getArmorName () - { + public String getArmorName() { return this.getClass().getSimpleName(); } @Override - public String getBaseTagName () - { + public String getBaseTagName() { return "TinkerArmor"; } @Override - public String getModifyType () - { + public String getModifyType() { return modifyType; } @Override - public String[] getTraits () - { - return new String[] { "armor" }; + public String[] getTraits() { + return new String[] {"armor"}; } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { int i = EntityLiving.getArmorPosition(stack) - 1; ItemStack itemstack1 = player.getCurrentArmor(i); - if (itemstack1 == null) - { - player.setCurrentItemOrArmor(i + 1, stack.copy()); //Forge: Vanilla bug fix associated with fixed setCurrentItemOrArmor indexs for players. + if (itemstack1 == null) { + player.setCurrentItemOrArmor( + i + 1, + stack.copy()); // Forge: Vanilla bug fix associated with fixed setCurrentItemOrArmor indexs for + // players. stack.stackSize = 0; } @@ -90,20 +84,16 @@ public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer pl } @Override - public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack) - { - for (ActiveArmorMod mod : TConstructRegistry.activeArmorModifiers) - { + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + for (ActiveArmorMod mod : TConstructRegistry.activeArmorModifiers) { mod.onArmorTick(world, player, itemStack, this, this.armorPart); } } @Override @SideOnly(Side.CLIENT) - public String getArmorTexture (ItemStack stack, Entity entity, int slot, String type) - { - if (slot == 2) - return "tinker:textures/armor/" + textureName + "_" + 2 + ".png"; + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + if (slot == 2) return "tinker:textures/armor/" + textureName + "_" + 2 + ".png"; return "tinker:textures/armor/" + textureName + "_" + 1 + ".png"; } @@ -112,31 +102,29 @@ public String getArmorTexture (ItemStack stack, Entity entity, int slot, String @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "pants" : this.armorType == 3 ? "boots" : "helmet")); + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + + (this.armorType == 0 + ? "helmet" + : this.armorType == 1 + ? "chestplate" + : this.armorType == 2 ? "pants" : this.armorType == 3 ? "boots" : "helmet")); registerModifiers(iconRegister); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (ItemStack stack, int renderPass) - { - if (renderPass > 0) - { - if (stack.hasTagCompound()) - { + public IIcon getIcon(ItemStack stack, int renderPass) { + if (renderPass > 0) { + if (stack.hasTagCompound()) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag(getBaseTagName()); - if (renderPass == 1 && tags.hasKey("Effect1")) - { + if (renderPass == 1 && tags.hasKey("Effect1")) { return modifiers[tags.getInteger("Effect1")]; } - if (renderPass == 2 && tags.hasKey("Effect2")) - { + if (renderPass == 2 && tags.hasKey("Effect2")) { return modifiers[tags.getInteger("Effect2")]; } - if (renderPass == 3 && tags.hasKey("Effect3")) - { + if (renderPass == 3 && tags.hasKey("Effect3")) { return modifiers[tags.getInteger("Effect3")]; } } @@ -147,55 +135,46 @@ public IIcon getIcon (ItemStack stack, int renderPass) } @SideOnly(Side.CLIENT) - protected void registerModifiers (IIconRegister iconRegister) - { - } + protected void registerModifiers(IIconRegister iconRegister) {} @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { + public boolean requiresMultipleRenderPasses() { return true; } @Override @SideOnly(Side.CLIENT) - public int getRenderPasses (int metadata) - { + public int getRenderPasses(int metadata) { return 4; } @Override @SideOnly(Side.CLIENT) - public boolean hasEffect (ItemStack par1ItemStack) - { + public boolean hasEffect(ItemStack par1ItemStack) { return false; } - //ISpecialArmor overrides + // ISpecialArmor overrides @Override - public ArmorProperties getProperties (EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) - { - //Priority, absorbRatio, max - if (!armor.hasTagCompound() || source.isUnblockable()) - return new ArmorProperties(0, 0, 0); + public ArmorProperties getProperties( + EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + // Priority, absorbRatio, max + if (!armor.hasTagCompound() || source.isUnblockable()) return new ArmorProperties(0, 0, 0); NBTTagCompound tags = armor.getTagCompound().getCompoundTag(getBaseTagName()); - if (tags.getBoolean("Broken")) - return new ArmorProperties(0, 0, 0); + if (tags.getBoolean("Broken")) return new ArmorProperties(0, 0, 0); double current = getProtection(tags); return new ArmorProperties(0, current / 100, 100); } - public double getProtection(ItemStack stack) - { + public double getProtection(ItemStack stack) { return getProtection(stack.getTagCompound().getCompoundTag(getBaseTagName())); } - public double getProtection(NBTTagCompound tags) - { + public double getProtection(NBTTagCompound tags) { float maxDurability = tags.getInteger("TotalDurability"); float currentDurability = maxDurability - tags.getInteger("Damage"); float ratio = currentDurability / maxDurability; @@ -207,59 +186,46 @@ public double getProtection(NBTTagCompound tags) } @Override - public int getArmorDisplay (EntityPlayer player, ItemStack armor, int slot) - { - if (slot != 1) - { + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (slot != 1) { ItemStack stack = player.getCurrentArmor(1); - if (stack != null && stack.getItem() instanceof ArmorCore) - return 0; + if (stack != null && stack.getItem() instanceof ArmorCore) return 0; return disconnectedArmorDisplay(player, armor, slot); } return combinedArmorDisplay(player, armor); } - protected int disconnectedArmorDisplay (EntityPlayer player, ItemStack armor, int slot) - { - if (!armor.hasTagCompound()) - return 0; + protected int disconnectedArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (!armor.hasTagCompound()) return 0; NBTTagCompound armorTag = armor.getTagCompound().getCompoundTag(getBaseTagName()); - if (armorTag.getBoolean("Broken")) - return 0; + if (armorTag.getBoolean("Broken")) return 0; float max = armorTag.getInteger("TotalDurability"); float current = max - armorTag.getInteger("Damage"); float amount = current / max * 5 + 0.09F; - if (slot == 2 && amount < 1) - amount = 1; + if (slot == 2 && amount < 1) amount = 1; return (int) amount; } - protected int combinedArmorDisplay (EntityPlayer player, ItemStack legs) - { - ItemStack[] armors = new ItemStack[] { player.getCurrentArmor(3), player.getCurrentArmor(2), legs, player.getCurrentArmor(0) }; + protected int combinedArmorDisplay(EntityPlayer player, ItemStack legs) { + ItemStack[] armors = + new ItemStack[] {player.getCurrentArmor(3), player.getCurrentArmor(2), legs, player.getCurrentArmor(0)}; int types = 0; int max = 0; int damage = 0; boolean anyAlive = false; - for (int i = 0; i < 4; i++) - { + for (int i = 0; i < 4; i++) { ItemStack stack = armors[i]; - if (stack != null && stack.hasTagCompound()) - { + if (stack != null && stack.hasTagCompound()) { NBTTagCompound armorTag = stack.getTagCompound().getCompoundTag(getBaseTagName()); - if (stack.getItem() instanceof ArmorCore) - { + if (stack.getItem() instanceof ArmorCore) { types++; max += armorTag.getInteger("TotalDurability"); - if (armorTag.getBoolean("Broken")) - { + if (armorTag.getBoolean("Broken")) { damage += armorTag.getInteger("TotalDurability"); - } - else - { + } else { damage += armorTag.getInteger("Damage"); anyAlive = true; } @@ -268,30 +234,23 @@ protected int combinedArmorDisplay (EntityPlayer player, ItemStack legs) } float ratio = ((float) max - (float) damage) / (float) max * (types * 5) + 0.1f; int minimum = anyAlive ? 1 : 0; - if (ratio < minimum) - ratio = minimum; + if (ratio < minimum) ratio = minimum; return (int) ratio; } @Override - public void damageArmor (EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot) - { - if (armor.hasTagCompound()) - { + public void damageArmor(EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot) { + if (armor.hasTagCompound()) { NBTTagCompound tags = armor.getTagCompound().getCompoundTag(getBaseTagName()); - if (!tags.getBoolean("Broken")) - { + if (!tags.getBoolean("Broken")) { int maxDurability = tags.getInteger("TotalDurability"); int currentDurability = tags.getInteger("Damage"); - if (currentDurability + damage > maxDurability) - { + if (currentDurability + damage > maxDurability) { tags.setInteger("Damage", 0); tags.setBoolean("Broken", true); armor.setItemDamage(0); entity.worldObj.playSound(entity.posX, entity.posY, entity.posZ, "random.break", 1f, 1f, true); - } - else - { + } else { tags.setInteger("Damage", currentDurability + damage); armor.setItemDamage(currentDurability + damage); } @@ -301,13 +260,11 @@ public void damageArmor (EntityLivingBase entity, ItemStack armor, DamageSource @Override @SideOnly(Side.CLIENT) - public void getSubItems (Item par1, CreativeTabs par2CreativeTabs, List par3List) - { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(getDefaultItem()); } - public ItemStack getDefaultItem () - { + public ItemStack getDefaultItem() { ItemStack gear = new ItemStack(this, 1, 0); NBTTagCompound baseTag = new NBTTagCompound(); @@ -322,11 +279,11 @@ public ItemStack getDefaultItem () int baseDurability = getDurability(); - tag.setInteger("Damage", 0); //Damage is damage to the armor + tag.setInteger("Damage", 0); // Damage is damage to the armor tag.setInteger("TotalDurability", baseDurability); tag.setInteger("BaseDurability", baseDurability); - tag.setInteger("BonusDurability", 0); //Modifier - tag.setFloat("ModDurability", 0f); //Modifier + tag.setInteger("BonusDurability", 0); // Modifier + tag.setFloat("ModDurability", 0f); // Modifier tag.setBoolean("Broken", false); tag.setBoolean("Built", true); @@ -335,66 +292,55 @@ public ItemStack getDefaultItem () return gear; } - protected double getFlatDefense () - { + protected double getFlatDefense() { return 0; } - protected abstract double getBaseDefense (); + protected abstract double getBaseDefense(); - protected abstract double getMaxDefense (); + protected abstract double getMaxDefense(); - protected abstract int getDurability (); + protected abstract int getDurability(); // Vanilla overrides - public boolean isItemTool (ItemStack par1ItemStack) - { + public boolean isItemTool(ItemStack par1ItemStack) { return false; } @Override - public boolean getIsRepairable (ItemStack par1ItemStack, ItemStack par2ItemStack) - { + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return false; } - public boolean isRepairable () - { + public boolean isRepairable() { return false; } - public int getItemEnchantability () - { + public int getItemEnchantability() { return 0; } - public boolean isFull3D () - { + public boolean isFull3D() { return true; } - public boolean isValidArmor (ItemStack stack, int armorType, Entity entity) - { + public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { return this.armorPart.getPartId() == armorType; } /* Proper stack damage */ - public int getItemMaxDamageFromStack (ItemStack stack) - { + public int getItemMaxDamageFromStack(ItemStack stack) { NBTTagCompound tags = stack.getTagCompound(); - if (tags == null) - { + if (tags == null) { return 0; } return tags.getCompoundTag(getBaseTagName()).getInteger("TotalDurability"); } - public int getItemMaxDamageFromStackForDisplay (ItemStack stack) - { + public int getItemMaxDamageFromStackForDisplay(ItemStack stack) { NBTTagCompound tags = stack.getTagCompound(); - if (tags == null) - { + if (tags == null) { return 0; } @@ -405,52 +351,43 @@ public int getItemMaxDamageFromStackForDisplay (ItemStack stack) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound().getCompoundTag(getBaseTagName()); double protection = 0; - if (!tags.getBoolean("Broken")) - { + if (!tags.getBoolean("Broken")) { protection = getProtection(tags); } if (protection > 0) list.add("\u00a77" + StatCollector.translateToLocal("armor.core.protection") + df.format(protection) + "%"); - else - list.add("\u00A7o" + StatCollector.translateToLocal("armor.core.broken")); + else list.add("\u00A7o" + StatCollector.translateToLocal("armor.core.broken")); boolean displayToolTips = true; int tipNum = 0; - while (displayToolTips) - { + while (displayToolTips) { tipNum++; String tooltip = "Tooltip" + tipNum; - if (tags.hasKey(tooltip)) - { + if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); // let's see if we can translate it somehow // strip color information String locString = "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); locString = locString.replace(" ", ""); - if(StatCollector.canTranslate(locString)) - tipName = tipName.replace(EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); - if (!tipName.equals("")) - list.add(tipName); - } - else - displayToolTips = false; + if (StatCollector.canTranslate(locString)) + tipName = tipName.replace( + EnumChatFormatting.getTextWithoutFormattingCodes(tipName), + StatCollector.translateToLocal(locString)); + if (!tipName.equals("")) list.add(tipName); + } else displayToolTips = false; } } /* Prevent armor from dying */ - public boolean hasCustomEntity (ItemStack stack) - { + public boolean hasCustomEntity(ItemStack stack) { return true; } - public Entity createEntity (World world, Entity location, ItemStack itemstack) - { + public Entity createEntity(World world, Entity location, ItemStack itemstack) { return new FancyEntityItem(world, location, itemstack); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/armor/ArmorMod.java b/src/main/java/tconstruct/library/armor/ArmorMod.java index ee2486c91fc..3bd34c9c304 100644 --- a/src/main/java/tconstruct/library/armor/ArmorMod.java +++ b/src/main/java/tconstruct/library/armor/ArmorMod.java @@ -5,25 +5,20 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.*; -public abstract class ArmorMod extends ItemModifier -{ +public abstract class ArmorMod extends ItemModifier { protected final EnumSet armorTypes; - public ArmorMod(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items) - { + public ArmorMod(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items) { super(items, effect, dataKey); this.armorTypes = armorTypes; } @Override - protected boolean canModify (ItemStack armor, ItemStack[] input) - { + protected boolean canModify(ItemStack armor, ItemStack[] input) { Item i = armor.getItem(); - if (!(i instanceof ArmorCore)) - return false; + if (!(i instanceof ArmorCore)) return false; ArmorCore item = (ArmorCore) armor.getItem(); - if (armorTypes.contains(item.armorPart)) - { + if (armorTypes.contains(item.armorPart)) { NBTTagCompound tags = getModifierTag(armor); return tags.getInteger("Modifiers") > 0; } @@ -31,8 +26,7 @@ protected boolean canModify (ItemStack armor, ItemStack[] input) } @Override - public boolean validType (IModifyable type) - { + public boolean validType(IModifyable type) { return type.getModifyType().equals("Armor") || type.getModifyType().equals("Clothing"); } } diff --git a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java index 4714f5878fd..138ac21f5cc 100644 --- a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java +++ b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java @@ -3,17 +3,16 @@ import java.util.*; import net.minecraft.item.ItemStack; -public abstract class ArmorModTypeFilter extends ArmorMod -{ +public abstract class ArmorModTypeFilter extends ArmorMod { public final List increase; - public ArmorModTypeFilter(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int[] values) - { + public ArmorModTypeFilter( + int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int[] values) { super(effect, dataKey, armorTypes, items); - assert items.length == values.length : "Itemstacks and their values for armor modifiers must be the same length"; + assert items.length == values.length + : "Itemstacks and their values for armor modifiers must be the same length"; this.increase = new ArrayList(); - for (int i = 0; i < values.length; i++) - { + for (int i = 0; i < values.length; i++) { increase.add(values[i]); } } @@ -21,7 +20,7 @@ public ArmorModTypeFilter(int effect, String dataKey, EnumSet armorTy /** * Checks to see if the inputs match the stored items Note: Filters types, * doesn't care about amount - * + * * @param input * The ItemStacks to compare against * @param tool @@ -29,61 +28,40 @@ public ArmorModTypeFilter(int effect, String dataKey, EnumSet armorTy * @return Whether the recipe matches the input */ @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { - if (!canModify(tool, input)) - return false; + public boolean matches(ItemStack[] input, ItemStack tool) { + if (!canModify(tool, input)) return false; boolean minimumMatch = false; - for (ItemStack inputStack : input) - { - if (inputStack == null) - continue; + for (ItemStack inputStack : input) { + if (inputStack == null) continue; boolean match = false; - for (Object check : stacks) - { + for (Object check : stacks) { ItemStack stack = (ItemStack) check; - if (stack.getItemDamage() == Short.MAX_VALUE) - { - if (this.areItemsEquivalent(inputStack, stack)) - match = true; - } - else - { - if (this.areItemStacksEquivalent(inputStack, stack)) - match = true; + if (stack.getItemDamage() == Short.MAX_VALUE) { + if (this.areItemsEquivalent(inputStack, stack)) match = true; + } else { + if (this.areItemStacksEquivalent(inputStack, stack)) match = true; } } - if (!match) - return false; + if (!match) return false; minimumMatch = true; } return minimumMatch; } - public int matchingAmount (ItemStack[] input) - { + public int matchingAmount(ItemStack[] input) { int amount = 0; - for (ItemStack inputStack : input) - { - if (inputStack == null) - continue; - else - { - for (int iter = 0; iter < stacks.size(); iter++) - { + for (ItemStack inputStack : input) { + if (inputStack == null) continue; + else { + for (int iter = 0; iter < stacks.size(); iter++) { ItemStack stack = (ItemStack) stacks.get(iter); - if (stack.getItemDamage() == Short.MAX_VALUE) - { - if (this.areItemsEquivalent(inputStack, stack)) - amount += increase.get(iter); - } - else - { - if (this.areItemStacksEquivalent(inputStack, stack)) - amount += increase.get(iter); + if (stack.getItemDamage() == Short.MAX_VALUE) { + if (this.areItemsEquivalent(inputStack, stack)) amount += increase.get(iter); + } else { + if (this.areItemStacksEquivalent(inputStack, stack)) amount += increase.get(iter); } } } @@ -91,29 +69,26 @@ public int matchingAmount (ItemStack[] input) return amount; } - public int matchingItems (ItemStack[] input) - { + public int matchingItems(ItemStack[] input) { int amount = 0; - for (ItemStack inputStack : input) - { - if (inputStack != null) - amount++; + for (ItemStack inputStack : input) { + if (inputStack != null) amount++; } return amount; } /** * Adds a new itemstack to the list for increases - * + * * @param stack * ItemStack to compare against * @param amount * Amount to increase */ - public void addStackToMatchList (ItemStack stack, int amount) - { + public void addStackToMatchList(ItemStack stack, int amount) { if (stack == null) - throw new NullPointerException("ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); + throw new NullPointerException( + "ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); stacks.add(stack); increase.add(amount); } diff --git a/src/main/java/tconstruct/library/armor/ArmorPart.java b/src/main/java/tconstruct/library/armor/ArmorPart.java index 620f8d4c861..9e1e33245b3 100644 --- a/src/main/java/tconstruct/library/armor/ArmorPart.java +++ b/src/main/java/tconstruct/library/armor/ArmorPart.java @@ -1,19 +1,18 @@ package tconstruct.library.armor; -public enum ArmorPart -{ - - Head(0), Chest(1), Legs(2), Feet(3); +public enum ArmorPart { + Head(0), + Chest(1), + Legs(2), + Feet(3); private final int partID; - private ArmorPart(int partID) - { + private ArmorPart(int partID) { this.partID = partID; } - public int getPartId () - { + public int getPartId() { return this.partID; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java index c19ed8a68d9..d0a4461f2ea 100644 --- a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java +++ b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java @@ -9,52 +9,50 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; -final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem -{ +final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem { /** * Dispense the specified stack, play the dispense sound and spawn * particles. */ @Override - protected ItemStack dispenseStack (IBlockSource par1IBlockSource, ItemStack par2ItemStack) - { + protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing enumfacing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); int i = par1IBlockSource.getXInt() + enumfacing.getFrontOffsetX(); int j = par1IBlockSource.getYInt() + enumfacing.getFrontOffsetY(); int k = par1IBlockSource.getZInt() + enumfacing.getFrontOffsetZ(); - AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox((double) i, (double) j, (double) k, (double) (i + 1), (double) (j + 1), (double) (k + 1)); - List list = par1IBlockSource.getWorld().selectEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb, new IEntitySelector.ArmoredMob(par2ItemStack)); + AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox( + (double) i, (double) j, (double) k, (double) (i + 1), (double) (j + 1), (double) (k + 1)); + List list = par1IBlockSource + .getWorld() + .selectEntitiesWithinAABB( + EntityLivingBase.class, axisalignedbb, new IEntitySelector.ArmoredMob(par2ItemStack)); - if (list.size() > 0) - { + if (list.size() > 0) { EntityLivingBase entitylivingbase = (EntityLivingBase) list.get(0); int l = entitylivingbase instanceof EntityPlayer ? 1 : 0; int i1 = EntityLiving.getArmorPosition(par2ItemStack); ItemStack itemstack1 = par2ItemStack.copy(); itemstack1.stackSize = 1; entitylivingbase.setCurrentItemOrArmor(i1, itemstack1); // BUGFIX - // Forge: - // Vanilla - // bug fix - // associated - // with - // fixed - // setCurrentItemOrArmor - // indexs - // for - // players. + // Forge: + // Vanilla + // bug fix + // associated + // with + // fixed + // setCurrentItemOrArmor + // indexs + // for + // players. - if (entitylivingbase instanceof EntityLiving) - { + if (entitylivingbase instanceof EntityLiving) { ((EntityLiving) entitylivingbase).setEquipmentDropChance(i1, 2.0F); } --par2ItemStack.stackSize; return par2ItemStack; - } - else - { + } else { return super.dispenseStack(par1IBlockSource, par2ItemStack); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/client/FluidRenderProperties.java b/src/main/java/tconstruct/library/client/FluidRenderProperties.java index 5794e70e2ce..281540b42d5 100644 --- a/src/main/java/tconstruct/library/client/FluidRenderProperties.java +++ b/src/main/java/tconstruct/library/client/FluidRenderProperties.java @@ -1,16 +1,14 @@ package tconstruct.library.client; -public class FluidRenderProperties -{ +public class FluidRenderProperties { - //Constant defaults + // Constant defaults public static final FluidRenderProperties DEFAULT_TABLE = new FluidRenderProperties(Applications.TABLE); public static final FluidRenderProperties DEFAULT_BASIN = new FluidRenderProperties(Applications.BASIN); public float minHeight, maxHeight, minX, maxX, minZ, maxZ; - public FluidRenderProperties(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) - { + public FluidRenderProperties(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) { this.minHeight = minHeight; this.maxHeight = maxHeight; this.minX = minX; @@ -19,39 +17,32 @@ public FluidRenderProperties(float minHeight, float maxHeight, float minX, float this.maxZ = maxZ; } - public FluidRenderProperties(float minHeight, float maxHeight, Applications defaults) - { + public FluidRenderProperties(float minHeight, float maxHeight, Applications defaults) { this(minHeight, maxHeight, defaults.minX, defaults.maxX, defaults.minZ, defaults.maxZ); } - public FluidRenderProperties(float minHeight, float maxHeight, float minX, float maxX, Applications defaults) - { + public FluidRenderProperties(float minHeight, float maxHeight, float minX, float maxX, Applications defaults) { this(minHeight, maxHeight, minX, maxX, defaults.minZ, defaults.maxZ); } - public FluidRenderProperties(Applications defaults, float minX, float maxX) - { + public FluidRenderProperties(Applications defaults, float minX, float maxX) { this(defaults.minHeight, defaults.maxHeight, minX, maxX, defaults.minZ, defaults.maxZ); } - public FluidRenderProperties(Applications defaults, float minX, float maxX, float minZ, float maxZ) - { + public FluidRenderProperties(Applications defaults, float minX, float maxX, float minZ, float maxZ) { this(defaults.minHeight, defaults.maxHeight, minX, maxX, minZ, maxZ); } - public FluidRenderProperties(Applications defaults) - { + public FluidRenderProperties(Applications defaults) { this(defaults.minHeight, defaults.maxHeight, defaults.minX, defaults.maxX, defaults.minZ, defaults.maxZ); } - public static enum Applications - { - TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.062F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); - + public static enum Applications { + TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.062F, 0.9375F), + BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); public float minHeight, maxHeight, minX, maxX, minZ, maxZ; - Applications(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) - { + Applications(float minHeight, float maxHeight, float minX, float maxX, float minZ, float maxZ) { this.minHeight = minHeight; this.maxHeight = maxHeight; this.minX = minX; @@ -60,4 +51,4 @@ public static enum Applications this.maxZ = maxZ; } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/client/GuiElement.java b/src/main/java/tconstruct/library/client/GuiElement.java index f9e766c6299..f5d977e3849 100644 --- a/src/main/java/tconstruct/library/client/GuiElement.java +++ b/src/main/java/tconstruct/library/client/GuiElement.java @@ -1,14 +1,12 @@ package tconstruct.library.client; -public class GuiElement -{ +public class GuiElement { public final int buttonIconX; public final int buttonIconY; public final String domain; public final String texture; - public GuiElement(int buttonIconX, int buttonIconY, String domain, String texture) - { + public GuiElement(int buttonIconX, int buttonIconY, String domain, String texture) { this.buttonIconX = buttonIconX; this.buttonIconY = buttonIconY; this.domain = domain; diff --git a/src/main/java/tconstruct/library/client/StencilGuiElement.java b/src/main/java/tconstruct/library/client/StencilGuiElement.java index 2acf1bcbb0a..0a2f406cc75 100644 --- a/src/main/java/tconstruct/library/client/StencilGuiElement.java +++ b/src/main/java/tconstruct/library/client/StencilGuiElement.java @@ -1,11 +1,9 @@ package tconstruct.library.client; -public class StencilGuiElement extends GuiElement -{ +public class StencilGuiElement extends GuiElement { public final int stencilIndex; - public StencilGuiElement(int buttonIconX, int buttonIconY, int stencilIndex, String domain, String texture) - { + public StencilGuiElement(int buttonIconX, int buttonIconY, int stencilIndex, String domain, String texture) { super(buttonIconX, buttonIconY, domain, texture); this.stencilIndex = stencilIndex; diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index f600b9a7bdf..ee2dc5e9a56 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -8,8 +8,7 @@ import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.tools.ToolCore; -public class TConstructClientRegistry -{ +public class TConstructClientRegistry { public static ArrayList stencilButtons = new ArrayList(); public static ArrayList stencilButtons2 = new ArrayList(); public static ArrayList toolButtons = new ArrayList(20); @@ -17,16 +16,13 @@ public class TConstructClientRegistry public static Map manualIcons = new HashMap(); public static ItemStack defaultStack = new ItemStack(Items.iron_ingot); - public static void addMaterialRenderMapping (int materialID, String domain, String renderName, boolean useDefaultFolder) - { - for (ToolCore tool : TConstructRegistry.getToolMapping()) - { + public static void addMaterialRenderMapping( + int materialID, String domain, String renderName, boolean useDefaultFolder) { + for (ToolCore tool : TConstructRegistry.getToolMapping()) { String[] toolIcons = new String[tool.getPartAmount() + 1]; - for (int i = 0; i < tool.getPartAmount() + 1; i++) - { + for (int i = 0; i < tool.getPartAmount() + 1; i++) { String icon = domain + ":"; - if (useDefaultFolder) - icon += tool.getDefaultFolder() + "/"; + if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getIconSuffix(i); toolIcons[i] = icon; } @@ -34,73 +30,67 @@ public static void addMaterialRenderMapping (int materialID, String domain, Stri } } - public static void addAlternateMaterialRenderMapping (ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) - { + public static void addAlternateMaterialRenderMapping( + ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { String[] toolIcons = new String[tool.getPartAmount() + 1]; - for (int i = 0; i < tool.getPartAmount() + 1; i++) - { + for (int i = 0; i < tool.getPartAmount() + 1; i++) { String icon = domain + ":"; - if (useDefaultFolder) - icon += tool.getDefaultFolder() + "/"; + if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getIconSuffix(i); toolIcons[i] = icon; } tool.registerAlternatePartPaths(materialID, toolIcons); } - public static void addEffectRenderMapping (ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) - { + public static void addEffectRenderMapping( + ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { String icon = domain + ":"; - if (useDefaultFolder) - icon += tool.getDefaultFolder() + "/"; + if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getEffectSuffix(); tool.registerEffectPath(materialID, icon); } - public static void addEffectRenderMapping (int materialID, String domain, String renderName, boolean useDefaultFolder) - { - for (ToolCore tool : TConstructRegistry.getToolMapping()) - { + public static void addEffectRenderMapping( + int materialID, String domain, String renderName, boolean useDefaultFolder) { + for (ToolCore tool : TConstructRegistry.getToolMapping()) { String icon = domain + ":"; - if (useDefaultFolder) - icon += tool.getDefaultFolder() + "/"; + if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getEffectSuffix(); tool.registerEffectPath(materialID, icon); } } - public static void addSingleEffectRenderMapping (ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) - { + public static void addSingleEffectRenderMapping( + ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { String icon = domain + ":"; - if (useDefaultFolder) - icon += tool.getDefaultFolder() + "/"; + if (useDefaultFolder) icon += tool.getDefaultFolder() + "/"; icon += renderName + tool.getEffectSuffix(); tool.registerEffectPath(materialID, icon); } - public static void registerManualModifier (String name, ItemStack output, ItemStack topinput) - { + public static void registerManualModifier(String name, ItemStack output, ItemStack topinput) { registerManualModifier(name, output, topinput, null); } - public static void registerManualModifier (String name, ItemStack output, ItemStack topinput, ItemStack bottominput) - { + public static void registerManualModifier( + String name, ItemStack output, ItemStack topinput, ItemStack bottominput) { ItemStack[] recipe = new ItemStack[3]; - recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] { topinput, bottominput });//ToolBuilder.instance.buildTool(output, topinput, bottominput, ""); + recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] {topinput, bottominput + }); // ToolBuilder.instance.buildTool(output, topinput, bottominput, ""); recipe[1] = topinput; recipe[2] = bottominput; MantleClientRegistry.recipeIcons.put(name, recipe); } - public static void registerManualModifier (String name, ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3) - { + public static void registerManualModifier( + String name, ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3) { registerManualModifier(name, output, input1, input2, input3, null); } - public static void registerManualModifier (String name, ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3, ItemStack input4) - { + public static void registerManualModifier( + String name, ItemStack output, ItemStack input1, ItemStack input2, ItemStack input3, ItemStack input4) { ItemStack[] recipe = new ItemStack[5]; - recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] { input1, input2, input3, input4 }); + recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] {input1, input2, input3, input4}); recipe[1] = input1; recipe[2] = input2; recipe[3] = input3; @@ -108,8 +98,7 @@ public static void registerManualModifier (String name, ItemStack output, ItemSt MantleClientRegistry.recipeIcons.put(name, recipe); } - public static void registerManualSmeltery (String name, ItemStack output, ItemStack liquid, ItemStack cast) - { + public static void registerManualSmeltery(String name, ItemStack output, ItemStack liquid, ItemStack cast) { ItemStack[] recipe = new ItemStack[3]; recipe[0] = output; recipe[1] = liquid; @@ -117,50 +106,60 @@ public static void registerManualSmeltery (String name, ItemStack output, ItemSt MantleClientRegistry.recipeIcons.put(name, recipe); } - //Gui - public static void addStencilButton (StencilGuiElement element) - { + // Gui + public static void addStencilButton(StencilGuiElement element) { stencilButtons.add(element); } - public static void addStencilButton (int xButton, int yButton, int index, String domain, String texture) - { + public static void addStencilButton(int xButton, int yButton, int index, String domain, String texture) { stencilButtons.add(new StencilGuiElement(xButton, yButton, index, domain, texture)); } - public static void addStencilButton2 (StencilGuiElement element) - { + public static void addStencilButton2(StencilGuiElement element) { stencilButtons.add(element); } // adds a button to the right side of the stencil table - public static void addStencilButton2 (int xButton, int yButton, int index, String domain, String texture) - { + public static void addStencilButton2(int xButton, int yButton, int index, String domain, String texture) { stencilButtons2.add(new StencilGuiElement(xButton, yButton, index, domain, texture)); } - public static void addToolButton (ToolGuiElement element) - { + public static void addToolButton(ToolGuiElement element) { toolButtons.add(element); } - public static void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body, String domain, String texture) - { + public static void addToolButton( + int slotType, + int xButton, + int yButton, + int[] xIcons, + int[] yIcons, + String title, + String body, + String domain, + String texture) { toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, domain, texture)); } - public static void addTierTwoButton (ToolGuiElement element) - { + public static void addTierTwoButton(ToolGuiElement element) { tierTwoButtons.add(element); } - public static void addTierTwoButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body, String domain, String texture) - { - tierTwoButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, domain, texture)); + public static void addTierTwoButton( + int slotType, + int xButton, + int yButton, + int[] xIcons, + int[] yIcons, + String title, + String body, + String domain, + String texture) { + tierTwoButtons.add( + new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, domain, texture)); } - public static ArrayList getToolButtons () - { + public static ArrayList getToolButtons() { return toolButtons; } } diff --git a/src/main/java/tconstruct/library/client/ToolGuiElement.java b/src/main/java/tconstruct/library/client/ToolGuiElement.java index a87efc5c82c..401eaeea92a 100644 --- a/src/main/java/tconstruct/library/client/ToolGuiElement.java +++ b/src/main/java/tconstruct/library/client/ToolGuiElement.java @@ -1,15 +1,13 @@ package tconstruct.library.client; -public class ToolGuiElement extends GuiElement -{ +public class ToolGuiElement extends GuiElement { public final int slotType; public final int[] iconsX; public final int[] iconsY; public final String title; public final String body; - public ToolGuiElement(int st, int bx, int by, int[] xi, int[] yi, String t, String b, String d, String tex) - { + public ToolGuiElement(int st, int bx, int by, int[] xi, int[] yi, String t, String b, String d, String tex) { super(bx, by, d, tex); slotType = st; iconsX = xi; diff --git a/src/main/java/tconstruct/library/component/IComponentHolder.java b/src/main/java/tconstruct/library/component/IComponentHolder.java index e1869d4fb89..47bd193f565 100644 --- a/src/main/java/tconstruct/library/component/IComponentHolder.java +++ b/src/main/java/tconstruct/library/component/IComponentHolder.java @@ -2,7 +2,6 @@ import java.util.List; -public interface IComponentHolder -{ - public List getComponents (); +public interface IComponentHolder { + public List getComponents(); } diff --git a/src/main/java/tconstruct/library/component/LogicComponent.java b/src/main/java/tconstruct/library/component/LogicComponent.java index cb3cf35a5f5..90e8f2fabe5 100644 --- a/src/main/java/tconstruct/library/component/LogicComponent.java +++ b/src/main/java/tconstruct/library/component/LogicComponent.java @@ -3,32 +3,22 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -public class LogicComponent -{ +public class LogicComponent { protected World world; - public void setWorld (World world) - { + public void setWorld(World world) { this.world = world; } - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { readNetworkNBT(tags); } - public void readNetworkNBT (NBTTagCompound tags) - { + public void readNetworkNBT(NBTTagCompound tags) {} - } - - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { writeNetworkNBT(tags); } - public void writeNetworkNBT (NBTTagCompound tags) - { - - } -} \ No newline at end of file + public void writeNetworkNBT(NBTTagCompound tags) {} +} diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index d445ef7674f..c0fdf1c695b 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -5,164 +5,122 @@ import net.minecraftforge.fluids.*; import tconstruct.library.crafting.Smeltery; -public class MultiFluidTank extends LogicComponent implements IFluidTank -{ +public class MultiFluidTank extends LogicComponent implements IFluidTank { public ArrayList fluidlist = new ArrayList(); protected int maxLiquid; protected int currentLiquid; - public MultiFluidTank() - { - } + public MultiFluidTank() {} - public MultiFluidTank(int max) - { + public MultiFluidTank(int max) { maxLiquid = max; } - public void setCapacity (int i) - { + public void setCapacity(int i) { maxLiquid = i; } @Override - public int getCapacity () - { + public int getCapacity() { return maxLiquid; } @Override - public int getFluidAmount () - { + public int getFluidAmount() { return currentLiquid; } @Override - public FluidStack drain (int maxDrain, boolean doDrain) - { - if (fluidlist.size() == 0) - return null; + public FluidStack drain(int maxDrain, boolean doDrain) { + if (fluidlist.size() == 0) return null; FluidStack liquid = fluidlist.get(0); - if (liquid != null) - { - if (liquid.amount - maxDrain <= 0) - { + if (liquid != null) { + if (liquid.amount - maxDrain <= 0) { FluidStack liq = liquid.copy(); - if (doDrain) - { + if (doDrain) { fluidlist.remove(liquid); currentLiquid = 0; } return liq; - } - else - { - if (doDrain) - { + } else { + if (doDrain) { liquid.amount -= maxDrain; currentLiquid -= maxDrain; } return new FluidStack(liquid.getFluid(), maxDrain, liquid.tag); } - } - else - { + } else { return new FluidStack(0, 0); } } @Override - public int fill (FluidStack resource, boolean doFill) - { - if (resource != null && currentLiquid < maxLiquid) - { - if (resource.amount + currentLiquid > maxLiquid) - resource.amount = maxLiquid - currentLiquid; + public int fill(FluidStack resource, boolean doFill) { + if (resource != null && currentLiquid < maxLiquid) { + if (resource.amount + currentLiquid > maxLiquid) resource.amount = maxLiquid - currentLiquid; int amount = resource.amount; - if (doFill) - { - if (addFluidToTank(resource, false)) - { + if (doFill) { + if (addFluidToTank(resource, false)) { ArrayList alloys = Smeltery.mixMetals(fluidlist); - for (int al = 0; al < alloys.size(); al++) - { + for (int al = 0; al < alloys.size(); al++) { FluidStack liquid = (FluidStack) alloys.get(al); addFluidToTank(liquid, true); } } } return amount; - } - else - return 0; + } else return 0; } - public boolean addFluidToTank (FluidStack liquid, boolean first) - { - if (fluidlist.size() == 0) - { + public boolean addFluidToTank(FluidStack liquid, boolean first) { + if (fluidlist.size() == 0) { fluidlist.add(liquid.copy()); currentLiquid += liquid.amount; return true; - } - else - { - if (liquid.amount + currentLiquid > maxLiquid) - return false; + } else { + if (liquid.amount + currentLiquid > maxLiquid) return false; currentLiquid += liquid.amount; boolean added = false; - for (int i = 0; i < fluidlist.size(); i++) - { + for (int i = 0; i < fluidlist.size(); i++) { FluidStack l = fluidlist.get(i); - if (l.isFluidEqual(liquid)) - { + if (l.isFluidEqual(liquid)) { l.amount += liquid.amount; added = true; } - if (l.amount <= 0) - { + if (l.amount <= 0) { fluidlist.remove(l); i--; } } - if (!added) - { - if (first) - fluidlist.add(0, liquid.copy()); - else - fluidlist.add(liquid.copy()); + if (!added) { + if (first) fluidlist.add(0, liquid.copy()); + else fluidlist.add(liquid.copy()); } return true; } } @Override - public FluidStack getFluid () - { - if (fluidlist.size() == 0) - return null; + public FluidStack getFluid() { + if (fluidlist.size() == 0) return null; return fluidlist.get(0); } - public List getAllFluids () - { + public List getAllFluids() { return fluidlist; } @Override - public FluidTankInfo getInfo () - { + public FluidTankInfo getInfo() { return new FluidTankInfo(this); } - public FluidTankInfo[] getMultiTankInfo () - { + public FluidTankInfo[] getMultiTankInfo() { FluidTankInfo[] info = new FluidTankInfo[fluidlist.size() + 1]; - for (int i = 0; i < fluidlist.size(); i++) - { + for (int i = 0; i < fluidlist.size(); i++) { FluidStack fluid = fluidlist.get(i); info[i] = new FluidTankInfo(fluid.copy(), fluid.amount); } @@ -173,26 +131,21 @@ public FluidTankInfo[] getMultiTankInfo () /* Sync liquids */ @Override - public void readNetworkNBT (NBTTagCompound tags) - { + public void readNetworkNBT(NBTTagCompound tags) { NBTTagList liquidTag = tags.getTagList("Liquids", 10); fluidlist.clear(); - for (int iter = 0; iter < liquidTag.tagCount(); iter++) - { + for (int iter = 0; iter < liquidTag.tagCount(); iter++) { NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); - if (fluid != null) - fluidlist.add(fluid); + if (fluid != null) fluidlist.add(fluid); } } @Override - public void writeNetworkNBT (NBTTagCompound tags) - { + public void writeNetworkNBT(NBTTagCompound tags) { NBTTagList taglist = new NBTTagList(); - for (FluidStack liquid : fluidlist) - { + for (FluidStack liquid : fluidlist) { NBTTagCompound nbt = new NBTTagCompound(); liquid.writeToNBT(nbt); taglist.appendTag(nbt); @@ -200,4 +153,4 @@ public void writeNetworkNBT (NBTTagCompound tags) tags.setTag("Liquids", taglist); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 355bc277ac2..61e2f712250 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -8,8 +8,7 @@ import net.minecraft.tileentity.TileEntity; import tconstruct.TConstruct; -public class TankLayerScan extends LogicComponent -{ +public class TankLayerScan extends LogicComponent { protected TileEntity master; protected IMasterLogic imaster; protected Block[] scanBlocks; @@ -29,110 +28,98 @@ public class TankLayerScan extends LogicComponent protected CoordTuple returnStone; private static boolean debug = System.getenv("DBG_MANTLE_TankLayerScan") != null; - private static int MAX_LAYER_RECURSION_DEPTH = System.getProperty("os.arch").equals("amd64") ? 4000 : 2000; // Recursion causes overflows on 32-bit, so reduce if not 64-bit + private static int MAX_LAYER_RECURSION_DEPTH = System.getProperty("os.arch").equals("amd64") + ? 4000 + : 2000; // Recursion causes overflows on 32-bit, so reduce if not 64-bit - public TankLayerScan(TileEntity te, Block... ids) - { + public TankLayerScan(TileEntity te, Block... ids) { assert te instanceof IMasterLogic : "TileEntity must be an instance of IMasterLogic"; master = te; imaster = (IMasterLogic) te; scanBlocks = ids; masterCoord = new CoordTuple(te.xCoord, te.yCoord, te.zCoord); - validAirCoords.add(new int[] { 1, 0 }); - validAirCoords.add(new int[] { -1, 0 }); - validAirCoords.add(new int[] { 0, 1 }); - validAirCoords.add(new int[] { 0, -1 }); - if (debug) - { + validAirCoords.add(new int[] {1, 0}); + validAirCoords.add(new int[] {-1, 0}); + validAirCoords.add(new int[] {0, 1}); + validAirCoords.add(new int[] {0, -1}); + if (debug) { TConstruct.logger.info("In debug mode: " + this); - TConstruct.logger.info("Using recursion size " + MAX_LAYER_RECURSION_DEPTH + " on JVM arch " + System.getProperty("os.arch")); + TConstruct.logger.info("Using recursion size " + MAX_LAYER_RECURSION_DEPTH + " on JVM arch " + + System.getProperty("os.arch")); } } - public void checkValidStructure () - { + public void checkValidStructure() { bricks = 0; airBlocks = 0; blockCoords.clear(); airCoords.clear(); boolean validAir = false; - //Check for air space in front of and behind the structure + // Check for air space in front of and behind the structure byte dir = getDirection(); - switch (getDirection()) - { - case 2: // +z - case 3: // -z - if (checkAir(master.xCoord, master.yCoord, master.zCoord - 1) && checkAir(master.xCoord, master.yCoord, master.zCoord + 1)) - validAir = true; - break; - case 4: // +x - case 5: // -x - if (checkAir(master.xCoord - 1, master.yCoord, master.zCoord) && checkAir(master.xCoord + 1, master.yCoord, master.zCoord)) - validAir = true; - break; + switch (getDirection()) { + case 2: // +z + case 3: // -z + if (checkAir(master.xCoord, master.yCoord, master.zCoord - 1) + && checkAir(master.xCoord, master.yCoord, master.zCoord + 1)) validAir = true; + break; + case 4: // +x + case 5: // -x + if (checkAir(master.xCoord - 1, master.yCoord, master.zCoord) + && checkAir(master.xCoord + 1, master.yCoord, master.zCoord)) validAir = true; + break; } - //Recurse the structure + // Recurse the structure boolean validBlocks = false; int xPos = 0, zPos = 0; - if (dir == 2) - xPos = 1; - if (dir == 3) - xPos = -1; - if (dir == 4) - zPos = -1; - if (dir == 5) - zPos = 1; + if (dir == 2) xPos = 1; + if (dir == 3) xPos = -1; + if (dir == 4) zPos = -1; + if (dir == 5) zPos = 1; returnStone = new CoordTuple(master.xCoord - xPos, master.yCoord, master.zCoord - zPos); - if (initialRecurseLayer(master.xCoord + xPos, master.yCoord, master.zCoord + zPos)) - { + if (initialRecurseLayer(master.xCoord + xPos, master.yCoord, master.zCoord + zPos)) { xPos = 0; zPos = 0; - switch (dir) - { - case 2: // +z - zPos = 1; - break; - case 3: // -z - zPos = -1; - break; - case 4: // +x - xPos = 1; - break; - case 5: // -x - xPos = -1; - break; + switch (dir) { + case 2: // +z + zPos = 1; + break; + case 3: // -z + zPos = -1; + break; + case 4: // +x + xPos = 1; + break; + case 5: // -x + xPos = -1; + break; } - if (!world.isRemote && debug) - TConstruct.logger.info("Bricks in recursion: " + blockCoords.size()); + if (!world.isRemote && debug) TConstruct.logger.info("Bricks in recursion: " + blockCoords.size()); blockCoords.clear(); bricks = 0; - //Does the actual adding of blocks in the ring + // Does the actual adding of blocks in the ring boolean sealed = floodTest(master.xCoord + xPos, master.yCoord, master.zCoord + zPos); - if (!world.isRemote && debug) - { + if (!world.isRemote && debug) { TConstruct.logger.info("Air in ring: " + airBlocks); TConstruct.logger.info("Bricks in ring: " + bricks); } - if (sealed) - { - blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); //Don't forget me! + if (sealed) { + blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); // Don't forget me! layerAirCoords = new HashSet(airCoords); layerBlockCoords = new HashSet(blockCoords); int lowY = recurseStructureDown(master.yCoord - 1); - if (lowY != -1) - { + if (lowY != -1) { completeStructure = true; structureTop = recurseStructureUp(master.yCoord + 1); finalizeStructure(); - if (!world.isRemote && debug) - { + if (!world.isRemote && debug) { TConstruct.logger.info("Air in structure: " + airCoords.size()); TConstruct.logger.info("Bricks in structure: " + blockCoords.size()); } @@ -141,67 +128,54 @@ public void checkValidStructure () } } - //@SuppressWarnings({ "unchecked" }) - protected void finalizeStructure () - { + // @SuppressWarnings({ "unchecked" }) + protected void finalizeStructure() { Collections.sort(blockCoords, new CoordTupleSort()); Collections.sort(airCoords, new CoordTupleSort()); - for (CoordTuple coord : blockCoords) - { + for (CoordTuple coord : blockCoords) { TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } - public boolean isComplete () - { + public boolean isComplete() { return completeStructure; } - public int getAirLayerSize () - { + public int getAirLayerSize() { return layerAirCoords.size(); } - public int getAirSize () - { + public int getAirSize() { return airBlocks; } - public CoordTuple getAirByIndex (int index) - { - if (index >= airCoords.size() || index < 0) - return null; + public CoordTuple getAirByIndex(int index) { + if (index >= airCoords.size() || index < 0) return null; return airCoords.get(index); } - private byte getDirection () - { - if (master instanceof IFacingLogic) - return ((IFacingLogic) master).getRenderDirection(); + private byte getDirection() { + if (master instanceof IFacingLogic) return ((IFacingLogic) master).getRenderDirection(); return 0; } - protected boolean checkAir (int x, int y, int z) - { + protected boolean checkAir(int x, int y, int z) { Block block = world.getBlock(x, y, z); - if (block == null || world.isAirBlock(x, y, z))// || block == TContent.tankAir) - return true; + if (block == null || world.isAirBlock(x, y, z)) // || block == TContent.tankAir) + return true; return false; } - protected boolean checkServant (int x, int y, int z) - { + protected boolean checkServant(int x, int y, int z) { Block block = world.getBlock(x, y, z); - if (block == null || world.isAirBlock(x, y, z) || !isValidBlock(x, y, z)) - return false; + if (block == null || world.isAirBlock(x, y, z) || !isValidBlock(x, y, z)) return false; - if (!block.hasTileEntity(world.getBlockMetadata(x, y, z))) - return false; + if (!block.hasTileEntity(world.getBlockMetadata(x, y, z))) return false; TileEntity be = world.getTileEntity(x, y, z); if (be instanceof IServantLogic) @@ -210,24 +184,17 @@ protected boolean checkServant (int x, int y, int z) return false; } - protected boolean initialRecurseLayer (int x, int y, int z) - { - if (bricks > MAX_LAYER_RECURSION_DEPTH) - return false; + protected boolean initialRecurseLayer(int x, int y, int z) { + if (bricks > MAX_LAYER_RECURSION_DEPTH) return false; CoordTuple keystone = new CoordTuple(x, y, z); - if (keystone.equals(returnStone)) - return true; + if (keystone.equals(returnStone)) return true; - for (int xPos = -1; xPos <= 1; xPos++) - { - for (int zPos = -1; zPos <= 1; zPos++) - { + for (int xPos = -1; xPos <= 1; xPos++) { + for (int zPos = -1; zPos <= 1; zPos++) { CoordTuple coord = new CoordTuple(x + xPos, y, z + zPos); - if (!blockCoords.contains(coord)) - { - if (isValidBlock(x + xPos, y, z + zPos)) - { + if (!blockCoords.contains(coord)) { + if (isValidBlock(x + xPos, y, z + zPos)) { bricks++; blockCoords.add(coord); return initialRecurseLayer(x + xPos, y, z + zPos); @@ -239,37 +206,26 @@ protected boolean initialRecurseLayer (int x, int y, int z) return false; } - protected boolean isValidBlock (int x, int y, int z) - { + protected boolean isValidBlock(int x, int y, int z) { Block block = world.getBlock(x, y, z); - if (block != null) - { - for (int i = 0; i < scanBlocks.length; i++) - { - if (block == scanBlocks[i]) - return true; + if (block != null) { + for (int i = 0; i < scanBlocks.length; i++) { + if (block == scanBlocks[i]) return true; } } return false; } - protected boolean floodTest (int x, int y, int z) - { - if (airBlocks > MAX_LAYER_RECURSION_DEPTH) - return false; + protected boolean floodTest(int x, int y, int z) { + if (airBlocks > MAX_LAYER_RECURSION_DEPTH) return false; - for (int[] offset : validAirCoords) - { + for (int[] offset : validAirCoords) { CoordTuple coord = new CoordTuple(x + offset[0], y, z + offset[1]); - if (!airCoords.contains(coord)) - { - if (checkAir(x + offset[0], y, z + offset[1])) - { + if (!airCoords.contains(coord)) { + if (checkAir(x + offset[0], y, z + offset[1])) { addAirBlock(coord.x, y, coord.z); floodTest(x + offset[0], y, z + offset[1]); - } - else if (!blockCoords.contains(coord) && checkServant(x + offset[0], y, z + offset[1])) - { + } else if (!blockCoords.contains(coord) && checkServant(x + offset[0], y, z + offset[1])) { bricks++; blockCoords.add(coord); } @@ -278,179 +234,134 @@ else if (!blockCoords.contains(coord) && checkServant(x + offset[0], y, z + offs return true; } - public int recurseStructureDown (int y) - { + public int recurseStructureDown(int y) { Iterator i = layerAirCoords.iterator(); - if (i.hasNext()) - { + if (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - if (checkAir(coord.x, y, coord.z)) - { + if (checkAir(coord.x, y, coord.z)) { boolean valid = true; - addAirBlock(coord.x, y, coord.z); //Don't skip first one + addAirBlock(coord.x, y, coord.z); // Don't skip first one - //Air blocks - while (i.hasNext()) - { + // Air blocks + while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkAir(coord.x, y, coord.z)) - { + if (checkAir(coord.x, y, coord.z)) { addAirBlock(coord.x, y, coord.z); - } - else - { + } else { valid = false; break; } } - //Bricks + // Bricks i = layerBlockCoords.iterator(); - while (i.hasNext()) - { + while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - blockCoords.add(new CoordTuple(coord.x, y, coord.z)); - - else - { + if (checkServant(coord.x, y, coord.z)) blockCoords.add(new CoordTuple(coord.x, y, coord.z)); + else { valid = false; break; } } - if (valid) - return recurseStructureDown(y - 1); - } - else if (checkServant(coord.x, y, coord.z)) - { - //Bottom floor. All blocks, please vacate the elevator + if (valid) return recurseStructureDown(y - 1); + } else if (checkServant(coord.x, y, coord.z)) { + // Bottom floor. All blocks, please vacate the elevator boolean valid = true; - while (i.hasNext()) - { + while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - blockCoords.add(new CoordTuple(coord.x, y, coord.z)); - - else - { + if (checkServant(coord.x, y, coord.z)) blockCoords.add(new CoordTuple(coord.x, y, coord.z)); + else { valid = false; break; } } - if (valid) - return y + 1; + if (valid) return y + 1; } } return -1; } - public int recurseStructureUp (int y) - { + public int recurseStructureUp(int y) { Iterator i = layerBlockCoords.iterator(); - if (i.hasNext()) - { + if (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - { + if (checkServant(coord.x, y, coord.z)) { boolean valid = true; - //Bricks - while (i.hasNext()) - { + // Bricks + while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - blockCoords.add(new CoordTuple(coord.x, y, coord.z)); - - else - { + if (checkServant(coord.x, y, coord.z)) blockCoords.add(new CoordTuple(coord.x, y, coord.z)); + else { valid = false; break; } } - //Air blocks - if (valid) - { + // Air blocks + if (valid) { i = layerAirCoords.iterator(); - while (i.hasNext()) - { + while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkAir(coord.x, y, coord.z)) - { + if (checkAir(coord.x, y, coord.z)) { addAirBlock(coord.x, y, coord.z); - } - else - { + } else { valid = false; break; } } } - if (valid) - recurseStructureUp(y + 1); + if (valid) recurseStructureUp(y + 1); } } return y - 1; } - protected void addAirBlock (int x, int y, int z) - { + protected void addAirBlock(int x, int y, int z) { airBlocks++; airCoords.add(new CoordTuple(x, y, z)); } /* Checking for valid structures */ - public void recheckStructure () - { + public void recheckStructure() { System.out.println("Rechecking structure"); int height = -1; - for (CoordTuple coord : blockCoords) - { + for (CoordTuple coord : blockCoords) { TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); boolean canPass = false; - if (servant instanceof IServantLogic) - { - canPass = ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); - if (canPass) - continue; + if (servant instanceof IServantLogic) { + canPass = ((IServantLogic) servant) + .verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + if (canPass) continue; } - if (!canPass) - { + if (!canPass) { System.out.println("Coord: " + coord); height = coord.y; break; } } - if (height != -1) - { - if (height <= master.yCoord) - invalidateStructure(); - else - invalidateBlocksAbove(height); - } - else - { - if (structureTop == 0) //Workaround for missing data + if (height != -1) { + if (height <= master.yCoord) invalidateStructure(); + else invalidateBlocksAbove(height); + } else { + if (structureTop == 0) // Workaround for missing data { - for (CoordTuple coord : blockCoords) - structureTop = coord.y; + for (CoordTuple coord : blockCoords) structureTop = coord.y; } structureTop = recurseStructureUp(structureTop + 1); finalizeStructure(); } } - protected void invalidateStructure () - { + protected void invalidateStructure() { completeStructure = false; - for (CoordTuple coord : blockCoords) - { + for (CoordTuple coord : blockCoords) { TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); @@ -458,12 +369,9 @@ protected void invalidateStructure () master.getWorldObj().markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); } - protected void invalidateBlocksAbove (int height) - { - for (CoordTuple coord : blockCoords) - { - if (coord.y < height) - continue; + protected void invalidateBlocksAbove(int height) { + for (CoordTuple coord : blockCoords) { + if (coord.y < height) continue; TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) @@ -472,15 +380,12 @@ protected void invalidateBlocksAbove (int height) } /** Do any necessary cleanup here. Remove air blocks, invalidate servants, etc */ - public void cleanup () - { + public void cleanup() { Iterator i = blockCoords.iterator(); - while (i.hasNext()) - { + while (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); TileEntity te = world.getTileEntity(coord.x, coord.y, coord.z); - if (te != null && te instanceof IServantLogic) - { + if (te != null && te instanceof IServantLogic) { ((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } @@ -488,40 +393,33 @@ public void cleanup () /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); NBTTagList layerAir = tags.getTagList("AirLayer", 10); - if (layerAir != null) - { + if (layerAir != null) { layerAirCoords.clear(); - for (int i = 0; i < layerAir.tagCount(); ++i) - { + for (int i = 0; i < layerAir.tagCount(); ++i) { int[] coord = layerAir.func_150306_c(i); layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } NBTTagList blocks = tags.getTagList("Blocks", 10); - if (blocks != null) - { + if (blocks != null) { blockCoords.clear(); - for (int i = 0; i < blocks.tagCount(); ++i) - { + for (int i = 0; i < blocks.tagCount(); ++i) { int[] coord = blocks.func_150306_c(i); blockCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } NBTTagList air = tags.getTagList("Air", 10); - if (air != null) - { + if (air != null) { airCoords.clear(); - for (int i = 0; i < air.tagCount(); ++i) - { + for (int i = 0; i < air.tagCount(); ++i) { int[] coord = air.func_150306_c(i); airCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } @@ -530,41 +428,35 @@ public void readFromNBT (NBTTagCompound tags) } @Override - public void readNetworkNBT (NBTTagCompound tags) - { + public void readNetworkNBT(NBTTagCompound tags) { completeStructure = tags.getBoolean("Complete"); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); NBTTagList layerAir = new NBTTagList(); - for (CoordTuple coord : layerAirCoords) - { - layerAir.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); + for (CoordTuple coord : layerAirCoords) { + layerAir.appendTag(new NBTTagIntArray(new int[] {coord.x, coord.y, coord.z})); } tags.setTag("AirLayer", layerAir); NBTTagList blocks = new NBTTagList(); - for (CoordTuple coord : blockCoords) - { - blocks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); + for (CoordTuple coord : blockCoords) { + blocks.appendTag(new NBTTagIntArray(new int[] {coord.x, coord.y, coord.z})); } tags.setTag("Blocks", blocks); NBTTagList air = new NBTTagList(); - for (CoordTuple coord : airCoords) - { - air.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); + for (CoordTuple coord : airCoords) { + air.appendTag(new NBTTagIntArray(new int[] {coord.x, coord.y, coord.z})); } tags.setTag("Air", air); tags.setInteger("structureTop", structureTop); } @Override - public void writeNetworkNBT (NBTTagCompound tags) - { + public void writeNetworkNBT(NBTTagCompound tags) { tags.setBoolean("Complete", completeStructure); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index 65501950b25..61f01362dfa 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -3,13 +3,11 @@ import java.util.*; import net.minecraftforge.fluids.FluidStack; -public class AlloyMix -{ +public class AlloyMix { public final FluidStack result; public final List mixers; - public AlloyMix(FluidStack output, List inputs) - { + public AlloyMix(FluidStack output, List inputs) { result = output; mixers = inputs; } @@ -19,23 +17,18 @@ public AlloyMix(FluidStack output, List inputs) * ArrayList(mixers); return false; } */ - public FluidStack mix (ArrayList liquids) - { + public FluidStack mix(ArrayList liquids) { ArrayList copyMix = new ArrayList(mixers); ArrayList effectiveAmount = new ArrayList(); - for (int i = 0; i < liquids.size(); i++) - { + for (int i = 0; i < liquids.size(); i++) { FluidStack liquid = liquids.get(i); Iterator iter = copyMix.iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { FluidStack mixer = (FluidStack) iter.next(); - if (mixer.isFluidEqual(liquid)) - { + if (mixer.isFluidEqual(liquid)) { // do we actually have enough of that liquid? - if(liquid.amount < mixer.amount) - break; + if (liquid.amount < mixer.amount) break; int eAmt = liquid.amount / mixer.amount; effectiveAmount.add(eAmt); @@ -45,28 +38,23 @@ public FluidStack mix (ArrayList liquids) } } - if (copyMix.size() > 0) - return null; + if (copyMix.size() > 0) return null; // Remove old liquids int low = getLowestAmount(effectiveAmount); ArrayList copyMix2 = new ArrayList(mixers); - for (int i = 0; i < liquids.size(); i++) - { + for (int i = 0; i < liquids.size(); i++) { FluidStack liquid = liquids.get(i); Iterator iter = copyMix2.iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { FluidStack mixer = (FluidStack) iter.next(); // if (mixer.itemID == liquid.itemID && mixer.itemMeta == // liquid.itemMeta) - if (mixer.isFluidEqual(liquid)) - { + if (mixer.isFluidEqual(liquid)) { int eAmt = low * mixer.amount; liquid.amount -= eAmt; - if (liquid.amount <= 0) - { + if (liquid.amount <= 0) { liquids.remove(liquid); i--; } @@ -81,14 +69,11 @@ public FluidStack mix (ArrayList liquids) return ret; } - int getLowestAmount (ArrayList list) - { + int getLowestAmount(ArrayList list) { int frist = (Integer) list.get(0); // FRIST!!! - for (int i = 1; i < list.size(); i++) - { + for (int i = 1; i < list.size(); i++) { int compare = (Integer) list.get(i); - if (frist > compare) - frist = compare; + if (frist > compare) frist = compare; } return frist; } diff --git a/src/main/java/tconstruct/library/crafting/CastingRecipe.java b/src/main/java/tconstruct/library/crafting/CastingRecipe.java index 6e917448959..85a9447010f 100644 --- a/src/main/java/tconstruct/library/crafting/CastingRecipe.java +++ b/src/main/java/tconstruct/library/crafting/CastingRecipe.java @@ -5,8 +5,7 @@ import net.minecraftforge.oredict.OreDictionary; import tconstruct.library.client.FluidRenderProperties; -public class CastingRecipe -{ +public class CastingRecipe { public ItemStack output; public FluidStack castingMetal; public ItemStack cast; @@ -15,8 +14,14 @@ public class CastingRecipe public FluidRenderProperties fluidRenderProperties; public boolean ignoreNBT; - public CastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props, boolean ignoreNBT) - { + public CastingRecipe( + ItemStack replacement, + FluidStack metal, + ItemStack cast, + boolean consume, + int delay, + FluidRenderProperties props, + boolean ignoreNBT) { castingMetal = metal; this.cast = cast; output = replacement; @@ -26,15 +31,21 @@ public CastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, bo this.ignoreNBT = ignoreNBT; } - public CastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) - { + public CastingRecipe( + ItemStack replacement, + FluidStack metal, + ItemStack cast, + boolean consume, + int delay, + FluidRenderProperties props) { this(replacement, metal, cast, consume, delay, props, false); } - public boolean matches (FluidStack metal, ItemStack inputCast) - { + public boolean matches(FluidStack metal, ItemStack inputCast) { if (castingMetal.isFluidEqual(metal)) { - if (cast != null && cast.getItemDamage() == OreDictionary.WILDCARD_VALUE && inputCast.getItem() == cast.getItem()) { + if (cast != null + && cast.getItemDamage() == OreDictionary.WILDCARD_VALUE + && inputCast.getItem() == cast.getItem()) { return true; } else if (!ignoreNBT && ItemStack.areItemStacksEqual(cast, inputCast)) { return true; @@ -45,8 +56,7 @@ public boolean matches (FluidStack metal, ItemStack inputCast) return false; } - public ItemStack getResult () - { + public ItemStack getResult() { return output.copy(); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index d23b5c98386..d42893830e9 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -7,43 +7,27 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; -public class Detailing -{ +public class Detailing { public List detailing = new ArrayList(); - public void addDetailing (Object input, int inputMeta, Object output, int outputMeta, ToolCore tool) - { + public void addDetailing(Object input, int inputMeta, Object output, int outputMeta, ToolCore tool) { ItemStack iID, oID; int iMeta = inputMeta, oMeta = outputMeta; - if (input instanceof Block) - iID = new ItemStack(((Block) input)); + if (input instanceof Block) iID = new ItemStack(((Block) input)); + else if (input instanceof Item) iID = new ItemStack(((Item) input)); + else if (input instanceof ItemStack) iID = ((ItemStack) input); + else throw new RuntimeException("Invalid detail input!"); - else if (input instanceof Item) - iID = new ItemStack(((Item) input)); - else if (input instanceof ItemStack) - iID = ((ItemStack) input); - - else - throw new RuntimeException("Invalid detail input!"); - - if (output instanceof Block) - oID = new ItemStack((Block) output); - - else if (output instanceof Item) - oID = new ItemStack((Item) output); - - else if (output instanceof ItemStack) - oID = (ItemStack) output; - - else - throw new RuntimeException("Invalid detail output!"); + if (output instanceof Block) oID = new ItemStack((Block) output); + else if (output instanceof Item) oID = new ItemStack((Item) output); + else if (output instanceof ItemStack) oID = (ItemStack) output; + else throw new RuntimeException("Invalid detail output!"); this.addDetailing(new DetailInput(iID, iMeta, oID, oMeta), tool); } - public void addDetailing (DetailInput details, ToolCore tool) - { + public void addDetailing(DetailInput details, ToolCore tool) { detailing.add(details); ItemStack toolstack = new ItemStack(tool, 1, Short.MAX_VALUE); @@ -56,31 +40,26 @@ public void addDetailing (DetailInput details, ToolCore tool) toolTag.setInteger("TotalDurability", 100); compound.setTag("InfiTool", toolTag); toolstack.setTagCompound(compound); - addShapelessToolRecipe(new ItemStack(details.output.getItem(), 1, details.outputMeta), toolstack, new ItemStack(details.input.getItem(), 1, details.inputMeta)); + addShapelessToolRecipe( + new ItemStack(details.output.getItem(), 1, details.outputMeta), + toolstack, + new ItemStack(details.input.getItem(), 1, details.inputMeta)); } - public void addShapelessToolRecipe (ItemStack par1ItemStack, Object... par2ArrayOfObj) - { + public void addShapelessToolRecipe(ItemStack par1ItemStack, Object... par2ArrayOfObj) { ArrayList arraylist = new ArrayList(); Object[] aobject = par2ArrayOfObj; int i = par2ArrayOfObj.length; - for (int j = 0; j < i; ++j) - { + for (int j = 0; j < i; ++j) { Object object1 = aobject[j]; - if (object1 instanceof ItemStack) - { + if (object1 instanceof ItemStack) { arraylist.add(((ItemStack) object1).copy()); - } - else if (object1 instanceof Item) - { + } else if (object1 instanceof Item) { arraylist.add(new ItemStack((Item) object1)); - } - else - { - if (!(object1 instanceof Block)) - { + } else { + if (!(object1 instanceof Block)) { throw new RuntimeException("Invalid shapeless tool recipe!"); } @@ -91,28 +70,23 @@ else if (object1 instanceof Item) GameRegistry.addRecipe(new ShapelessToolRecipe(par1ItemStack, arraylist)); } - public DetailInput getDetailing (Block block, int inputMeta) - { - for (int i = 0; i < detailing.size(); i++) - { + public DetailInput getDetailing(Block block, int inputMeta) { + for (int i = 0; i < detailing.size(); i++) { DetailInput detail = (DetailInput) detailing.get(i); - if (Item.getItemFromBlock(block) == detail.input.getItem() && inputMeta == detail.inputMeta) - { + if (Item.getItemFromBlock(block) == detail.input.getItem() && inputMeta == detail.inputMeta) { return detail; } } return null; } - public class DetailInput - { + public class DetailInput { public ItemStack input; public int inputMeta; public ItemStack output; public int outputMeta; - public DetailInput(ItemStack input, int inputMeta, ItemStack output, int outputMeta) - { + public DetailInput(ItemStack input, int inputMeta, ItemStack output, int outputMeta) { this.input = input; this.inputMeta = inputMeta; this.output = output; diff --git a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java index c914611a315..12d5005c8e4 100644 --- a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java +++ b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java @@ -4,85 +4,64 @@ import net.minecraft.block.Block; import net.minecraft.item.*; -public class DryingRackRecipes -{ +public class DryingRackRecipes { public static ArrayList recipes = new ArrayList(); - public static void addDryingRecipe (Object input, int time, Object output) - { + public static void addDryingRecipe(Object input, int time, Object output) { ItemStack inputItem = null; ItemStack outputItem = null; - if (input instanceof ItemStack) - inputItem = (ItemStack) input; - else if (input instanceof Item) - inputItem = new ItemStack((Item) input, 1, 0); - else if (input instanceof Block) - inputItem = new ItemStack((Block) input, 1, 0); - else - throw new RuntimeException("Drying recipe input is invalid!"); + if (input instanceof ItemStack) inputItem = (ItemStack) input; + else if (input instanceof Item) inputItem = new ItemStack((Item) input, 1, 0); + else if (input instanceof Block) inputItem = new ItemStack((Block) input, 1, 0); + else throw new RuntimeException("Drying recipe input is invalid!"); - if (output instanceof ItemStack) - outputItem = (ItemStack) output; - else if (output instanceof Item) - outputItem = new ItemStack((Item) output, 1, 0); - else if (output instanceof Block) - outputItem = new ItemStack((Block) output, 1, 0); - else - throw new RuntimeException("Drying recipe output is invalid!"); + if (output instanceof ItemStack) outputItem = (ItemStack) output; + else if (output instanceof Item) outputItem = new ItemStack((Item) output, 1, 0); + else if (output instanceof Block) outputItem = new ItemStack((Block) output, 1, 0); + else throw new RuntimeException("Drying recipe output is invalid!"); recipes.add(new DryingRecipe(inputItem, time, outputItem)); } - public static int getDryingTime (ItemStack input) - { - for (DryingRecipe r : recipes) - { - if (r.matches(input)) - return r.time; + public static int getDryingTime(ItemStack input) { + for (DryingRecipe r : recipes) { + if (r.matches(input)) return r.time; } return -1; } - public static ItemStack getDryingResult (ItemStack input) - { - for (DryingRecipe r : recipes) - { - if (r.matches(input)) - return r.getResult(); + public static ItemStack getDryingResult(ItemStack input) { + for (DryingRecipe r : recipes) { + if (r.matches(input)) return r.getResult(); } return null; } - public static class DryingRecipe - { + public static class DryingRecipe { public final int time; public final ItemStack input; public final ItemStack result; - DryingRecipe(ItemStack input, int time, ItemStack result) - { + DryingRecipe(ItemStack input, int time, ItemStack result) { this.time = time; this.input = input; this.result = result; } - public boolean matches (ItemStack input) - { + public boolean matches(ItemStack input) { // makes all drying rack recipies compatible with stuff killed by a frying pan - if(input.hasTagCompound()) { + if (input.hasTagCompound()) { input = input.copy(); input.getTagCompound().removeTag("frypanKill"); - if(input.getTagCompound().hasNoTags()) - input.setTagCompound(null); + if (input.getTagCompound().hasNoTags()) input.setTagCompound(null); } return ItemStack.areItemStacksEqual(this.input, input); } - public ItemStack getResult () - { + public ItemStack getResult() { return result.copy(); } } diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index e0100b8d5bb..e19913eb4b1 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -4,8 +4,7 @@ import net.minecraft.block.Block; import net.minecraftforge.fluids.Fluid; -public class FluidType -{ +public class FluidType { public final Block renderBlock; public final int renderMeta; public final int baseTemperature; @@ -14,8 +13,7 @@ public class FluidType public static HashMap fluidTypes = new HashMap(); - public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) - { + public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { this.renderBlock = block; this.renderMeta = meta; this.baseTemperature = baseTemperature; @@ -23,43 +21,36 @@ public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolea this.isToolpart = isToolpart; } - public static void registerFluidType (String name, FluidType type) - { + public static void registerFluidType(String name, FluidType type) { fluidTypes.put(name, type); } - public static void registerFluidType (String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) - { + public static void registerFluidType( + String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { FluidType type = new FluidType(block, meta, baseTemperature, fluid, isToolpart); registerFluidType(name, type); } - public static FluidType getFluidType (String typeName) - { + public static FluidType getFluidType(String typeName) { return fluidTypes.get(typeName); } - public static FluidType getFluidType (Fluid searchedFluid) - { + public static FluidType getFluidType(Fluid searchedFluid) { Iterator iter = fluidTypes.entrySet().iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); - if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) - return (FluidType) pairs.getValue(); + if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) return (FluidType) pairs.getValue(); } return null; } - public static int getTemperatureByFluid (Fluid searchedFluid) - { + public static int getTemperatureByFluid(Fluid searchedFluid) { Iterator iter = fluidTypes.entrySet().iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) return ((FluidType) pairs.getValue()).baseTemperature; } return 800; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/crafting/LiquidCasting.java b/src/main/java/tconstruct/library/crafting/LiquidCasting.java index 326b978e6ce..54a9a5bac64 100644 --- a/src/main/java/tconstruct/library/crafting/LiquidCasting.java +++ b/src/main/java/tconstruct/library/crafting/LiquidCasting.java @@ -6,24 +6,20 @@ import tconstruct.library.client.FluidRenderProperties; /* Melting becomes hardened */ -public class LiquidCasting -{ +public class LiquidCasting { // public static LiquidCasting instance = new LiquidCasting(); private final ArrayList casts = new ArrayList(); - private boolean contains (CastingRecipe recipe) - { - for (CastingRecipe c : casts) - { - if (c.matches(recipe.castingMetal, recipe.cast)) - return true; + private boolean contains(CastingRecipe recipe) { + for (CastingRecipe c : casts) { + if (c.matches(recipe.castingMetal, recipe.cast)) return true; } return false; } /** * Adds a casting recipe - * + * * @param output * Result of the cast * @param metal @@ -38,16 +34,20 @@ private boolean contains (CastingRecipe recipe) * @param props * The rendering properties for the casting fluid (may be null) */ - public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) - { + public void addCastingRecipe( + ItemStack output, + FluidStack metal, + ItemStack cast, + boolean consume, + int delay, + FluidRenderProperties props) { CastingRecipe cr = new CastingRecipe(output, metal, cast, consume, delay, props); - if (!contains(cr)) - casts.add(cr); + if (!contains(cr)) casts.add(cr); } /** * Adds a casting recipe - * + * * @param output * Result of the cast * @param metal @@ -60,14 +60,13 @@ public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast * @param delay * Time to cast in ticks */ - public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) - { + public void addCastingRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) { addCastingRecipe(output, metal, cast, consume, delay, null); } /** * Adds a casting recipe. Does not consume the cast - * + * * @param output * Result of the cast * @param metal @@ -80,14 +79,14 @@ public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast * @param props * The rendering properties for the casting fluid (may be null) */ - public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast, int delay, FluidRenderProperties props) - { + public void addCastingRecipe( + ItemStack output, FluidStack metal, ItemStack cast, int delay, FluidRenderProperties props) { addCastingRecipe(output, metal, cast, false, delay, props); } /** * Adds a casting recipe. Does not consume the cast - * + * * @param output * Result of the cast * @param metal @@ -98,15 +97,14 @@ public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast * @param delay * Time to cast in ticks */ - public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast, int delay) - { + public void addCastingRecipe(ItemStack output, FluidStack metal, ItemStack cast, int delay) { addCastingRecipe(output, metal, cast, false, delay, null); } /** * Adds a casting recipe. Does not consume the cast or have an item to cast * against - * + * * @param output * Result of the cast * @param metal @@ -117,15 +115,14 @@ public void addCastingRecipe (ItemStack output, FluidStack metal, ItemStack cast * @param props * The rendering properties for the casting fluid (may be null) */ - public void addCastingRecipe (ItemStack output, FluidStack metal, int delay, FluidRenderProperties props) - { + public void addCastingRecipe(ItemStack output, FluidStack metal, int delay, FluidRenderProperties props) { addCastingRecipe(output, metal, null, false, delay, props); } /** * Adds a casting recipe. Does not consume the cast or have an item to cast * against - * + * * @param output * Result of the cast * @param metal @@ -134,45 +131,35 @@ public void addCastingRecipe (ItemStack output, FluidStack metal, int delay, Flu * @param delay * Time to cast in ticks */ - public void addCastingRecipe (ItemStack output, FluidStack metal, int delay) - { + public void addCastingRecipe(ItemStack output, FluidStack metal, int delay) { addCastingRecipe(output, metal, null, false, delay, null); } - public void addCustomCastingRecipe (CastingRecipe recipe) - { + public void addCustomCastingRecipe(CastingRecipe recipe) { casts.add(recipe); } - public int getCastingDelay (FluidStack metal, ItemStack cast) - { + public int getCastingDelay(FluidStack metal, ItemStack cast) { CastingRecipe recipe = getCastingRecipe(metal, cast); - if (recipe != null) - return recipe.coolTime; + if (recipe != null) return recipe.coolTime; return -1; } - public int getCastingAmount (FluidStack metal, ItemStack cast) - { + public int getCastingAmount(FluidStack metal, ItemStack cast) { CastingRecipe recipe = getCastingRecipe(metal, cast); - if (recipe != null) - return recipe.castingMetal.amount; + if (recipe != null) return recipe.castingMetal.amount; return 0; } - public CastingRecipe getCastingRecipe (FluidStack metal, ItemStack cast) - { - for (CastingRecipe recipe : casts) - { - if (recipe.matches(metal, cast)) - return recipe; + public CastingRecipe getCastingRecipe(FluidStack metal, ItemStack cast) { + for (CastingRecipe recipe : casts) { + if (recipe.matches(metal, cast)) return recipe; } return null; } // Getter for public viewing - public ArrayList getCastingRecipes () - { + public ArrayList getCastingRecipes() { return casts; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java index f97ab1a6ea3..91d6d313803 100644 --- a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java @@ -2,52 +2,44 @@ import java.util.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import tconstruct.library.event.ModifyEvent; import tconstruct.library.modifier.*; -public class ModifyBuilder -{ +public class ModifyBuilder { public static ModifyBuilder instance = new ModifyBuilder(); public List itemModifiers = new ArrayList(); - public ItemStack modifyItem (ItemStack input, ItemStack[] modifiers) - { - ItemStack copy = input.copy(); //Prevent modifying the original - if (copy.getItem() instanceof IModifyable) - { + public ItemStack modifyItem(ItemStack input, ItemStack[] modifiers) { + ItemStack copy = input.copy(); // Prevent modifying the original + if (copy.getItem() instanceof IModifyable) { IModifyable item = (IModifyable) copy.getItem(); boolean built = false; - for (ItemModifier mod : itemModifiers) - { - if (mod.matches(modifiers, copy) && mod.validType(item)) - { + for (ItemModifier mod : itemModifiers) { + if (mod.matches(modifiers, copy) && mod.validType(item)) { ModifyEvent event = new ModifyEvent(mod, item, copy); MinecraftForge.EVENT_BUS.post(event); - if(event.isCanceled()) - continue; + if (event.isCanceled()) continue; built = true; - mod.addMatchingEffect(copy); //Order matters here + mod.addMatchingEffect(copy); // Order matters here mod.modify(modifiers, copy); // we do not allow negative modifiers >:( - if(copy.getTagCompound().getCompoundTag(item.getBaseTagName()).getInteger("Modifiers") < 0) - return null; + if (copy.getTagCompound() + .getCompoundTag(item.getBaseTagName()) + .getInteger("Modifiers") + < 0) return null; } } - if (built) - return copy; + if (built) return copy; } return null; } - public static void registerModifier (ItemModifier mod) - { - if (mod == null) - throw new NullPointerException("Modifier cannot be null."); + public static void registerModifier(ItemModifier mod) { + if (mod == null) throw new NullPointerException("Modifier cannot be null."); instance.itemModifiers.add(mod); } } diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index aff336a9ae8..b1ffa2d6c30 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -11,8 +11,7 @@ import tconstruct.library.tools.CustomMaterial; import tconstruct.library.util.IPattern; -public class PatternBuilder -{ +public class PatternBuilder { public static PatternBuilder instance = new PatternBuilder(); // Map items to their parts with a hashmap public List materials = new ArrayList(); @@ -22,73 +21,57 @@ public class PatternBuilder public List toolPatterns = new ArrayList(); /* Register methods */ - public void registerMaterial (ItemStack material, int value, String key) - { + public void registerMaterial(ItemStack material, int value, String key) { materials.add(new ItemKey(material.getItem(), material.getItemDamage(), value, key)); } - public void registerMaterialSet (String key, ItemStack shard, ItemStack rod, int materialID) - { + public void registerMaterialSet(String key, ItemStack shard, ItemStack rod, int materialID) { materialSets.put(key, new MaterialSet(shard, rod, materialID)); materials.add(new ItemKey(shard.getItem(), shard.getItemDamage(), 1, key)); } - public void registerFullMaterial (ItemStack material, int value, String key, ItemStack shard, ItemStack rod, int materialID) - { + public void registerFullMaterial( + ItemStack material, int value, String key, ItemStack shard, ItemStack rod, int materialID) { materials.add(new ItemKey(material.getItem(), material.getItemDamage(), value, key)); materials.add(new ItemKey(shard.getItem(), shard.getItemDamage(), 1, key)); materialSets.put(key, new MaterialSet(shard, rod, materialID)); } - public void addToolPattern (IPattern item) - { + public void addToolPattern(IPattern item) { toolPatterns.add(item); } /* Build tool parts from patterns */ - public ItemStack[] getToolPart (ItemStack material, ItemStack pattern, ItemStack otherPattern) - { - if (material != null && pattern != null) - { + public ItemStack[] getToolPart(ItemStack material, ItemStack pattern, ItemStack otherPattern) { + if (material != null && pattern != null) { PartBuilderEvent.NormalPart event = new PartBuilderEvent.NormalPart(material, pattern, otherPattern); MinecraftForge.EVENT_BUS.post(event); - if (event.getResult() == Result.ALLOW) - { + if (event.getResult() == Result.ALLOW) { return event.getResultStacks(); - } - else if (event.getResult() == Result.DENY) - { + } else if (event.getResult() == Result.DENY) { return null; } ItemKey key = getItemKey(material); - if (key != null) - { + if (key != null) { MaterialSet mat = (MaterialSet) materialSets.get(key.key); ItemStack toolPart = getMatchingPattern(pattern, material, mat); - if (toolPart != null) - { + if (toolPart != null) { int patternValue = ((IPattern) pattern.getItem()).getPatternCost(pattern); int totalMaterial = key.value * material.stackSize; if (totalMaterial < patternValue) // Not enough material - return null; - + return null; else if (patternValue == key.value) // Material only - return new ItemStack[] { toolPart, null }; - - else - { - if (patternValue % 2 == 1 && mat.shard != null) - { - return new ItemStack[] { toolPart, mat.shard.copy() }; // Material - // + - // shard - } - else - return new ItemStack[] { toolPart, null }; + return new ItemStack[] {toolPart, null}; + else { + if (patternValue % 2 == 1 && mat.shard != null) { + return new ItemStack[] {toolPart, mat.shard.copy()}; // Material + // + + // shard + } else return new ItemStack[] {toolPart, null}; } /* * if ( patternValue < totalMaterial ) { if (otherPattern != @@ -99,11 +82,11 @@ else if (patternValue == key.value) // Material only * otherPart = getMatchingPattern(otherPattern, mat); return * new ItemStack[] { toolPart, otherPart }; //Material + * Material } } } - * + * * else if ( patternValue == key.value ) return new * ItemStack[] { new ItemStack(toolPart, 1, mat.materialID), * null }; //Material only - * + * * else return null; //Not a valid match */ } @@ -112,13 +95,10 @@ else if (patternValue == key.value) // Material only return null; } - public int getPartID (ItemStack material) - { - if (material != null) - { + public int getPartID(ItemStack material) { + if (material != null) { ItemKey key = getItemKey(material); - if (key != null) - { + if (key != null) { MaterialSet set = (MaterialSet) materialSets.get(key.key); return set.materialID; } @@ -126,73 +106,56 @@ public int getPartID (ItemStack material) return Short.MAX_VALUE; } - public int getPartValue (ItemStack material) - { - if (material != null) - { + public int getPartValue(ItemStack material) { + if (material != null) { ItemKey key = getItemKey(material); - if (key != null) - return key.value; + if (key != null) return key.value; - for (CustomMaterial mat : TConstructRegistry.customMaterials) - { - if (mat.matches(material)) - return mat.value; + for (CustomMaterial mat : TConstructRegistry.customMaterials) { + if (mat.matches(material)) return mat.value; } } return 0; } - public ItemKey getItemKey (ItemStack material) - { + public ItemKey getItemKey(ItemStack material) { Item mat = material.getItem(); int damage = material.getItemDamage(); - for (ItemKey ik : materials) - { - if (mat == ik.item && (ik.damage == Short.MAX_VALUE || damage == ik.damage)) - return ik; + for (ItemKey ik : materials) { + if (mat == ik.item && (ik.damage == Short.MAX_VALUE || damage == ik.damage)) return ik; } return null; } - public ItemStack getMatchingPattern (ItemStack stack, ItemStack input, MaterialSet set) - { + public ItemStack getMatchingPattern(ItemStack stack, ItemStack input, MaterialSet set) { Item item = stack.getItem(); - for (IPattern pattern : toolPatterns) - { - if (pattern == item) - return pattern.getPatternOutput(stack, input, set); + for (IPattern pattern : toolPatterns) { + if (pattern == item) return pattern.getPatternOutput(stack, input, set); } return null; } - public ItemStack getShardFromSet (String materialset) - { + public ItemStack getShardFromSet(String materialset) { MaterialSet set = (MaterialSet) materialSets.get(materialset); - if (set != null && set.shard != null) - return set.shard.copy(); + if (set != null && set.shard != null) return set.shard.copy(); return null; } - public ItemStack getRodFromSet (String materialset) - { + public ItemStack getRodFromSet(String materialset) { MaterialSet set = (MaterialSet) materialSets.get(materialset); - if (set != null) - return set.rod.copy(); + if (set != null) return set.rod.copy(); return null; } // Small data classes. I would prefer the struct from C#, but we do what we // can. - public class ItemKey - { + public class ItemKey { public final Item item; public final int damage; public final int value; public final String key; - public ItemKey(Item i, int d, int v, String s) - { + public ItemKey(Item i, int d, int v, String s) { item = i; damage = d; value = v; @@ -200,14 +163,12 @@ public ItemKey(Item i, int d, int v, String s) } } - public class MaterialSet - { + public class MaterialSet { public final ItemStack shard; public final ItemStack rod; public final int materialID; - public MaterialSet(ItemStack s, ItemStack r, int id) - { + public MaterialSet(ItemStack s, ItemStack r, int id) { shard = s; rod = r; materialID = id; @@ -215,23 +176,21 @@ public MaterialSet(ItemStack s, ItemStack r, int id) } // Helper Methods - public void registerMaterial (Block material, int value, String key) - { + public void registerMaterial(Block material, int value, String key) { registerMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key); } - public void registerMaterial (Item material, int value, String key) - { + public void registerMaterial(Item material, int value, String key) { registerMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key); } - public void registerFullMaterial (Block material, int value, String key, ItemStack shard, ItemStack rod, int materialID) - { + public void registerFullMaterial( + Block material, int value, String key, ItemStack shard, ItemStack rod, int materialID) { registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, shard, rod, materialID); } - public void registerFullMaterial (Item material, int value, String key, ItemStack shard, ItemStack rod, int materialID) - { + public void registerFullMaterial( + Item material, int value, String key, ItemStack shard, ItemStack rod, int materialID) { registerFullMaterial(new ItemStack(material, 1, Short.MAX_VALUE), value, key, shard, rod, materialID); } @@ -241,11 +200,11 @@ public void registerFullMaterial (Item material, int value, String key, ItemStac * Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1, * materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID); * } - * + * * public void registerFullMaterial (Item material, int value, String key, * int materialID) { registerFullMaterial(new ItemStack(material, 1, * Short.MAX_VALUE), value, key, new ItemStack(TContent.toolShard, 1, * materialID), new ItemStack(TContent.toolRod, 1, materialID), materialID); * } */ -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index 8649e9fc8dc..b46c1291aa1 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -10,58 +10,47 @@ import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; -public class ShapelessToolRecipe extends ShapelessRecipes -{ +public class ShapelessToolRecipe extends ShapelessRecipes { static { - RecipeSorter.register(TConstruct.modID + ":" + "toolrecipe", ShapelessToolRecipe.class, RecipeSorter.Category.SHAPELESS, ""); + RecipeSorter.register( + TConstruct.modID + ":" + "toolrecipe", ShapelessToolRecipe.class, RecipeSorter.Category.SHAPELESS, ""); } - public ShapelessToolRecipe(ItemStack par1ItemStack, List par2List) - { + public ShapelessToolRecipe(ItemStack par1ItemStack, List par2List) { super(par1ItemStack, par2List); } @Override - public boolean matches (InventoryCrafting par1InventoryCrafting, World par2World) - { + public boolean matches(InventoryCrafting par1InventoryCrafting, World par2World) { ArrayList arraylist = new ArrayList(this.recipeItems); - for (int i = 0; i < 3; ++i) - { - for (int j = 0; j < 3; ++j) - { + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 3; ++j) { ItemStack itemstack = par1InventoryCrafting.getStackInRowAndColumn(j, i); - if (itemstack != null) - { + if (itemstack != null) { boolean flag = false; Iterator iterator = arraylist.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { ItemStack itemstack1 = (ItemStack) iterator.next(); // TConstruct.logger.info("Rawr! "+itemstack1.getItemDamage()); - if (itemstack.getItem() == itemstack1.getItem()) - { - if (itemstack.getItem() instanceof ToolCore) - { + if (itemstack.getItem() == itemstack1.getItem()) { + if (itemstack.getItem() instanceof ToolCore) { NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return false; + if (tags.getBoolean("Broken")) return false; flag = true; - } - else if((itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage())) - flag = true; + } else if ((itemstack1.getItemDamage() == Short.MAX_VALUE + || itemstack.getItemDamage() == itemstack1.getItemDamage())) flag = true; arraylist.remove(itemstack1); break; } } - if (!flag) - { + if (!flag) { return false; } } @@ -70,5 +59,4 @@ else if((itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamag return arraylist.isEmpty(); } - } diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index b71679f01ae..70eaf7f9a2e 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -8,8 +8,7 @@ import net.minecraftforge.oredict.OreDictionary; /** Melting and hacking, churn and burn */ -public class Smeltery -{ +public class Smeltery { public static Smeltery instance = new Smeltery(); private final Map smeltingList = new HashMap(); @@ -24,24 +23,21 @@ public class Smeltery * @param power The temperature of the fluid. This also influences the melting speed. Lava is 1000. * @param duration How long one "portion" of liquid fuels the smeltery. Lava is 10. */ - public static void addSmelteryFuel (Fluid fluid, int power, int duration) - { - instance.smelteryFuels.put(fluid, new Integer[] { power, duration }); + public static void addSmelteryFuel(Fluid fluid, int power, int duration) { + instance.smelteryFuels.put(fluid, new Integer[] {power, duration}); } /** * Returns true if the liquid is a valid smeltery fuel. */ - public static boolean isSmelteryFuel (Fluid fluid) - { + public static boolean isSmelteryFuel(Fluid fluid) { return instance.smelteryFuels.containsKey(fluid); } /** * Returns the power of a smeltery fuel or 0 if it's not a fuel. */ - public static int getFuelPower (Fluid fluid) - { + public static int getFuelPower(Fluid fluid) { Integer[] power = instance.smelteryFuels.get(fluid); return power == null ? 0 : power[0]; } @@ -49,8 +45,7 @@ public static int getFuelPower (Fluid fluid) /** * Returns the duration of a smeltery fuel or 0 if it's not a fuel. */ - public static int getFuelDuration (Fluid fluid) - { + public static int getFuelDuration(Fluid fluid) { Integer[] power = instance.smelteryFuels.get(fluid); return power == null ? 0 : power[1]; } @@ -59,31 +54,28 @@ public static int getFuelDuration (Fluid fluid) * Adds mappings between an itemstack and an output liquid Example: * Smeltery.addMelting(Block.oreIron, 0, 600, new * FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); - * + * * @param stack The itemstack to liquify. Must hold a block. * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other structures may vary * @param output The result of the process in liquid form */ - public static void addMelting (ItemStack stack, int temperature, FluidStack output) - { + public static void addMelting(ItemStack stack, int temperature, FluidStack output) { if (stack.getItem() instanceof ItemBlock) addMelting(stack, ((ItemBlock) stack.getItem()).field_150939_a, stack.getItemDamage(), temperature, output); - else - throw new IllegalArgumentException("ItemStack must house a block."); + else throw new IllegalArgumentException("ItemStack must house a block."); } /** * Adds mappings between a block and its liquid Example: * Smeltery.addMelting(Block.oreIron, 0, 600, new * FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); - * + * * @param block The block to liquify and render * @param metadata The metadata of the block to liquify and render * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other structures may vary * @param output The result of the process in liquid form */ - public static void addMelting (Block block, int metadata, int temperature, FluidStack output) - { + public static void addMelting(Block block, int metadata, int temperature, FluidStack output) { addMelting(new ItemStack(block, 1, metadata), block, metadata, temperature, output); } @@ -92,15 +84,14 @@ public static void addMelting (Block block, int metadata, int temperature, Fluid * input's block ID and metadata Example: Smeltery.addMelting(Block.oreIron, * 0, 600, new FluidStack(liquidMetalStill.blockID, * TConstruct.ingotLiquidValue * 2, 0)); - * + * * @param input The item to liquify * @param block The block to render * @param metadata The metadata of the block to render * @param temperature How hot the block should be before liquifying * @param liquid The result of the process */ - public static void addMelting (ItemStack input, Block block, int metadata, int temperature, FluidStack liquid) - { + public static void addMelting(ItemStack input, Block block, int metadata, int temperature, FluidStack liquid) { ItemMetaWrapper in = new ItemMetaWrapper(input); instance.smeltingList.put(in, liquid); instance.temperatureList.put(in, temperature); @@ -112,148 +103,136 @@ public static void addMelting (ItemStack input, Block block, int metadata, int t * FluidStack(bronzeID, 2, 0), new FluidStack(copperID, 3, 0), new * FluidStack(tinID, 1, 0)); The example mixes 3 copper with 1 tin to make 2 * bronze - * + * * @param result The output of the combination of mixers. The quantity is used for amount of a successful mix * @param mixers the liquids to be mixed. Quantities are used as ratios */ - public static void addAlloyMixing (FluidStack result, FluidStack... mixers) - { + public static void addAlloyMixing(FluidStack result, FluidStack... mixers) { ArrayList inputs = new ArrayList(); - for (FluidStack liquid : mixers) - inputs.add(liquid); + for (FluidStack liquid : mixers) inputs.add(liquid); instance.alloys.add(new AlloyMix(result, inputs)); } /** * Used to get the resulting temperature from a source ItemStack - * + * * @param item The Source ItemStack * @return The result temperature */ - public static Integer getLiquifyTemperature (ItemStack item) - { - if (item == null) - return 20; + public static Integer getLiquifyTemperature(ItemStack item) { + if (item == null) return 20; Integer temp = instance.temperatureList.get(new ItemMetaWrapper(item)); - if (temp == null) - return 20; - else - return temp; + if (temp == null) return 20; + else return temp; } /** * Used to get the resulting temperature from a source Block - * + * * @param block The Source Block * @return The result ItemStack */ - public static Integer getLiquifyTemperature (Block block, int metadata) - { + public static Integer getLiquifyTemperature(Block block, int metadata) { return instance.getLiquifyTemperature(new ItemStack(block, 1, metadata)); } /** * Used to get the resulting ItemStack from a source ItemStack - * + * * @param item The Source ItemStack * @return The result ItemStack */ - public static FluidStack getSmelteryResult (ItemStack item) - { - if (item == null) - return null; + public static FluidStack getSmelteryResult(ItemStack item) { + if (item == null) return null; FluidStack stack = instance.smeltingList.get(new ItemMetaWrapper(item)); - if (stack == null) - return null; + if (stack == null) return null; return stack.copy(); } /** * Used to get the resulting ItemStack from a source Block - * + * * @param block The Source Block * @return The result ItemStack */ - public static FluidStack getSmelteryResult (Block block, int metadata) - { + public static FluidStack getSmelteryResult(Block block, int metadata) { return instance.getSmelteryResult(new ItemStack(block, 1, metadata)); } - public static ItemStack getRenderIndex (ItemStack input) - { + public static ItemStack getRenderIndex(ItemStack input) { return instance.renderIndex.get(new ItemMetaWrapper(input)); } - public static ArrayList mixMetals (ArrayList moltenMetal) - { + public static ArrayList mixMetals(ArrayList moltenMetal) { ArrayList liquids = new ArrayList(); - for (AlloyMix alloy : instance.alloys) - { + for (AlloyMix alloy : instance.alloys) { FluidStack liquid = alloy.mix(moltenMetal); - if (liquid != null) - liquids.add(liquid); + if (liquid != null) liquids.add(liquid); } return liquids; } - public static Map getSmeltingList () - { + public static Map getSmeltingList() { return instance.smeltingList; } - public static Map getTemperatureList () - { + public static Map getTemperatureList() { return instance.temperatureList; } - public static Map getRenderIndex () - { + public static Map getRenderIndex() { return instance.renderIndex; } - public static List getAlloyList () - { + public static List getAlloyList() { return instance.alloys; } /** * Adds a mapping between FluidType and ItemStack - * + * * @author samtrion - * + * * @param type Type of Fluid * @param input The item to liquify * @param temperatureDifference Difference between FluidType BaseTemperature * @param fluidAmount Amount of Fluid */ - public static void addMelting (FluidType type, ItemStack input, int temperatureDifference, int fluidAmount) - { + public static void addMelting(FluidType type, ItemStack input, int temperatureDifference, int fluidAmount) { int temp = type.baseTemperature + temperatureDifference; - if (temp <= 20) - temp = type.baseTemperature; + if (temp <= 20) temp = type.baseTemperature; if (input.getItem() instanceof ItemBlock) - addMelting(input, ((ItemBlock) input.getItem()).field_150939_a, input.getItemDamage(), type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); + addMelting( + input, + ((ItemBlock) input.getItem()).field_150939_a, + input.getItemDamage(), + type.baseTemperature + temperatureDifference, + new FluidStack(type.fluid, fluidAmount)); else - addMelting(input, type.renderBlock, type.renderMeta, type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); + addMelting( + input, + type.renderBlock, + type.renderMeta, + type.baseTemperature + temperatureDifference, + new FluidStack(type.fluid, fluidAmount)); } /** * Adds all Items to the Smeltery based on the oreDictionary Name - * + * * @author samtrion - * + * * @param oreName oreDictionary name e.g. oreIron * @param type Type of Fluid * @param temperatureDifference Difference between FluidType BaseTemperature * @param fluidAmount Amount of Fluid */ - public static void addDictionaryMelting (String oreName, FluidType type, int temperatureDifference, int fluidAmount) - { - for (ItemStack is : OreDictionary.getOres(oreName)) - addMelting(type, is, temperatureDifference, fluidAmount); + public static void addDictionaryMelting( + String oreName, FluidType type, int temperatureDifference, int fluidAmount) { + for (ItemStack is : OreDictionary.getOres(oreName)) addMelting(type, is, temperatureDifference, fluidAmount); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/crafting/StencilBuilder.java b/src/main/java/tconstruct/library/crafting/StencilBuilder.java index 9f261dcba62..a2cfdc984ae 100644 --- a/src/main/java/tconstruct/library/crafting/StencilBuilder.java +++ b/src/main/java/tconstruct/library/crafting/StencilBuilder.java @@ -4,71 +4,62 @@ import net.minecraft.item.*; import net.minecraftforge.oredict.OreDictionary; -public class StencilBuilder -{ +public class StencilBuilder { public static StencilBuilder instance = new StencilBuilder(); - public List blanks = new LinkedList(); // i wish ItemStack would support equals so i could use a Set here... + public List blanks = + new LinkedList(); // i wish ItemStack would support equals so i could use a Set here... public Map stencils = new TreeMap(); /** * Returns whether the given ItemStack is a blank pattern and therefore usable for stencil crafting. */ - public static boolean isBlank (ItemStack stack) - { + public static boolean isBlank(ItemStack stack) { for (ItemStack blank : instance.blanks) if (OreDictionary.itemMatches(stack, blank, false)) // this has nothing to do with the oredictionary. - return true; + return true; return false; } - public static void registerBlankStencil (ItemStack itemStack) - { + public static void registerBlankStencil(ItemStack itemStack) { instance.blanks.add(itemStack); } - public static void registerStencil (int id, Item item, int meta) - { + public static void registerStencil(int id, Item item, int meta) { registerStencil(id, new ItemStack(item, 1, meta)); } - public static void registerStencil (int id, ItemStack pattern) - { - if(instance.stencils.containsKey(id)) - throw new IllegalArgumentException("[TCon API] Stencil ID " + id + " is already occupied by " + instance.stencils.get(id).getDisplayName()); + public static void registerStencil(int id, ItemStack pattern) { + if (instance.stencils.containsKey(id)) + throw new IllegalArgumentException("[TCon API] Stencil ID " + id + " is already occupied by " + + instance.stencils.get(id).getDisplayName()); instance.stencils.put(id, pattern); } - public static Collection getStencils () - { + public static Collection getStencils() { return instance.stencils.values(); } /** * Returns the index of the given stencil. If no stencil is found, returns -1. */ - public static int getId(ItemStack stencil) - { - for(Map.Entry entry : instance.stencils.entrySet()) - if (OreDictionary.itemMatches(stencil, entry.getValue(), false)) - return entry.getKey(); + public static int getId(ItemStack stencil) { + for (Map.Entry entry : instance.stencils.entrySet()) + if (OreDictionary.itemMatches(stencil, entry.getValue(), false)) return entry.getKey(); return -1; } // returns the stencil with the given index - public static ItemStack getStencil (int num) - { - if (!instance.stencils.containsKey(num)) - return null; + public static ItemStack getStencil(int num) { + if (!instance.stencils.containsKey(num)) return null; return instance.stencils.get(num).copy(); } - public static int getStencilCount () - { + public static int getStencilCount() { return instance.stencils.size(); } } diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index 31ee2760821..80515ad2226 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -2,9 +2,7 @@ /** Once upon a time, too many tools to count. Let's put them together automatically */ import cpw.mods.fml.common.eventhandler.Event.Result; - import java.util.*; - import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; @@ -15,8 +13,7 @@ import tconstruct.library.tools.*; import tconstruct.library.util.IToolPart; -public class ToolBuilder -{ +public class ToolBuilder { public static ToolBuilder instance = new ToolBuilder(); public HashMap recipeList = new HashMap(); @@ -24,110 +21,89 @@ public class ToolBuilder public HashMap modifiers = new HashMap(); /* Build tools */ - public static void addNormalToolRecipe (ToolCore output, Item head, Item handle) - { + public static void addNormalToolRecipe(ToolCore output, Item head, Item handle) { ToolRecipe recipe = instance.recipeList.get(output.getToolName()); - if (recipe != null) - { + if (recipe != null) { recipe.addHeadItem(head); recipe.addHandleItem(handle); - } - else - { + } else { recipe = new ToolRecipe(head, handle, output); instance.combos.add(recipe); instance.recipeList.put(output.getToolName(), recipe); } } - public static void addNormalToolRecipe (ToolCore output, Item head, Item handle, Item accessory) - { - //instance.combos.add(new ToolRecipe(head, accessory, output)); + public static void addNormalToolRecipe(ToolCore output, Item head, Item handle, Item accessory) { + // instance.combos.add(new ToolRecipe(head, accessory, output)); ToolRecipe recipe = instance.recipeList.get(output.getToolName()); - if (recipe != null) - { + if (recipe != null) { recipe.addHeadItem(head); recipe.addHandleItem(handle); recipe.addAccessoryItem(accessory); - } - else - { + } else { recipe = new ToolRecipe(head, handle, accessory, output); instance.combos.add(recipe); instance.recipeList.put(output.getToolName(), recipe); } } - public static void addNormalToolRecipe (ToolCore output, Item head, Item handle, Item accessory, Item extra) - { + public static void addNormalToolRecipe(ToolCore output, Item head, Item handle, Item accessory, Item extra) { ToolRecipe recipe = instance.recipeList.get(output.getToolName()); - if (recipe != null) - { + if (recipe != null) { recipe.addHeadItem(head); recipe.addHandleItem(handle); recipe.addAccessoryItem(accessory); recipe.addExtraItem(extra); - } - else - { + } else { recipe = new ToolRecipe(head, handle, accessory, extra, output); instance.combos.add(recipe); instance.recipeList.put(output.getToolName(), recipe); } } - public static void addCustomToolRecipe (ToolRecipe recipe) - { + public static void addCustomToolRecipe(ToolRecipe recipe) { instance.combos.add(recipe); } - public static void addToolRecipe (ToolCore output, Item... items) - { - if (items.length == 2) - addNormalToolRecipe(output, items[0], items[1]); - if (items.length == 3) - addNormalToolRecipe(output, items[0], items[1], items[2]); - if (items.length == 4) - addNormalToolRecipe(output, items[0], items[1], items[2], items[3]); + public static void addToolRecipe(ToolCore output, Item... items) { + if (items.length == 2) addNormalToolRecipe(output, items[0], items[1]); + if (items.length == 3) addNormalToolRecipe(output, items[0], items[1], items[2]); + if (items.length == 4) addNormalToolRecipe(output, items[0], items[1], items[2], items[3]); } - public ToolCore getMatchingRecipe (Item head, Item handle, Item accessory, Item extra) - { - for (ToolRecipe recipe : combos) - { - if (recipe.validHead(head) && recipe.validHandle(handle) && recipe.validAccessory(accessory) && recipe.validExtra(extra)) - return recipe.getType(); + public ToolCore getMatchingRecipe(Item head, Item handle, Item accessory, Item extra) { + for (ToolRecipe recipe : combos) { + if (recipe.validHead(head) + && recipe.validHandle(handle) + && recipe.validAccessory(accessory) + && recipe.validExtra(extra)) return recipe.getType(); } return null; } - //Builds a tool from the parts given - public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, String name) - { + // Builds a tool from the parts given + public ItemStack buildTool(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, String name) { return buildTool(headStack, handleStack, accessoryStack, null, name); } - public int getMaterialID (ItemStack stack) - { - if (stack == null) - return -1; + public int getMaterialID(ItemStack stack) { + if (stack == null) return -1; Item item = stack.getItem(); - if (item instanceof IToolPart) - return ((IToolPart) item).getMaterialID(stack); + if (item instanceof IToolPart) return ((IToolPart) item).getMaterialID(stack); return -1; } - public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) - { + public ItemStack buildTool( + ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) { /*if (headStack != null && headStack.getItem() instanceof ToolCore) - return modifyTool(headStack, new ItemStack[] { handleStack, accessoryStack, extraStack }, name);*/ + return modifyTool(headStack, new ItemStack[] { handleStack, accessoryStack, extraStack }, name);*/ - if (headStack == null || handleStack == null) //Nothing to build without these. All tools need at least two parts! - return null; - if (name == null) - name = ""; + if (headStack == null + || handleStack == null) // Nothing to build without these. All tools need at least two parts! + return null; + if (name == null) name = ""; // fire the ToolBuild event to get the correct items ToolBuildEvent buildEvent = new ToolBuildEvent(headStack, handleStack, accessoryStack, extraStack, name); @@ -144,54 +120,41 @@ public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStac boolean validMaterials = true; int head = -1, handle = -1, accessory = -1, extra = -1; head = getMaterialID(headStack); - if (head == -1) - validMaterials = false; + if (head == -1) validMaterials = false; handle = getMaterialID(handleStack); - if (handle == -1) - validMaterials = false; + if (handle == -1) validMaterials = false; - if (!validMaterials) - return null; + if (!validMaterials) return null; - if (accessoryStack == null) - { + if (accessoryStack == null) { item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), null, null); - } - else - { + } else { accessory = getMaterialID(accessoryStack); - if (accessory == -1) - return null; + if (accessory == -1) return null; - if (extraStack != null) - { + if (extraStack != null) { extra = getMaterialID(extraStack); - if (extra == -1) - return null; + if (extra == -1) return null; - item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), extraStack.getItem()); - } - else - { + item = getMatchingRecipe( + headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), extraStack.getItem()); + } else { item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), null); } } - if (item == null) - return null; + if (item == null) return null; ToolMaterial headMat = null, handleMat = null, accessoryMat = null, extraMat = null; headMat = TConstructRegistry.getMaterial(head); handleMat = TConstructRegistry.getMaterial(handle); - if (accessory != -1) - accessoryMat = TConstructRegistry.getMaterial(accessory); + if (accessory != -1) accessoryMat = TConstructRegistry.getMaterial(accessory); - if (extra != -1) - extraMat = TConstructRegistry.getMaterial(extra); + if (extra != -1) extraMat = TConstructRegistry.getMaterial(extra); int durability = headMat.durability(); int heads = 1; @@ -199,58 +162,45 @@ public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStac float modifier = 1f; int attack = headMat.attack(); - if (item.durabilityTypeHandle() == 2) - { + if (item.durabilityTypeHandle() == 2) { heads++; durability += handleMat.durability(); attack += handleMat.attack(); - } - else if (item.durabilityTypeHandle() == 1) - { + } else if (item.durabilityTypeHandle() == 1) { handles++; modifier = handleMat.handleDurability(); } - if (accessory != -1) - { - if (item.durabilityTypeAccessory() == 2) - { + if (accessory != -1) { + if (item.durabilityTypeAccessory() == 2) { heads++; durability += accessoryMat.durability(); attack += accessoryMat.attack(); - } - else if (item.durabilityTypeAccessory() == 1) - { + } else if (item.durabilityTypeAccessory() == 1) { handles++; modifier += accessoryMat.handleDurability(); } } - if (extra != -1) - { - if (item.durabilityTypeExtra() == 2) - { + if (extra != -1) { + if (item.durabilityTypeExtra() == 2) { heads++; durability += extraMat.durability(); attack += extraMat.attack(); - } - else if (item.durabilityTypeExtra() == 1) - { + } else if (item.durabilityTypeExtra() == 1) { handles++; modifier += extraMat.handleDurability(); } } - if (handles > 0) - { + if (handles > 0) { modifier *= (0.5 + handles * 0.5); modifier /= handles; } durability = (int) (durability / heads * (0.5 + heads * 0.5) * modifier * item.getDurabilityModifier()); attack = attack / heads + item.getDamageVsEntity(null); - if (attack % heads != 0) - attack++; + if (attack % heads != 0) attack++; ItemStack tool = new ItemStack(item); NBTTagCompound compound = new NBTTagCompound(); @@ -262,75 +212,65 @@ else if (item.durabilityTypeExtra() == 1) compound.getCompoundTag("InfiTool").setInteger("Handle", handle); compound.getCompoundTag("InfiTool").setInteger("RenderHandle", handle); - if (accessory != -1) - { + if (accessory != -1) { compound.getCompoundTag("InfiTool").setInteger("Accessory", accessory); compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", accessory); } - if (extra != -1) - { + if (extra != -1) { compound.getCompoundTag("InfiTool").setInteger("Extra", extra); compound.getCompoundTag("InfiTool").setInteger("RenderExtra", extra); } - compound.getCompoundTag("InfiTool").setInteger("Damage", 0); //Damage is damage to the tool + compound.getCompoundTag("InfiTool").setInteger("Damage", 0); // Damage is damage to the tool compound.getCompoundTag("InfiTool").setInteger("TotalDurability", durability); compound.getCompoundTag("InfiTool").setInteger("BaseDurability", durability); - compound.getCompoundTag("InfiTool").setInteger("BonusDurability", 0); //Modifier - compound.getCompoundTag("InfiTool").setFloat("ModDurability", 0f); //Modifier + compound.getCompoundTag("InfiTool").setInteger("BonusDurability", 0); // Modifier + compound.getCompoundTag("InfiTool").setFloat("ModDurability", 0f); // Modifier compound.getCompoundTag("InfiTool").setBoolean("Broken", false); compound.getCompoundTag("InfiTool").setInteger("Attack", attack); compound.getCompoundTag("InfiTool").setInteger("BaseAttack", attack); compound.getCompoundTag("InfiTool").setInteger("MiningSpeed", headMat.toolSpeed()); compound.getCompoundTag("InfiTool").setInteger("HarvestLevel", headMat.harvestLevel()); - if (item.durabilityTypeHandle() == 2) - { + if (item.durabilityTypeHandle() == 2) { compound.getCompoundTag("InfiTool").setInteger("MiningSpeedHandle", handleMat.toolSpeed()); compound.getCompoundTag("InfiTool").setInteger("HarvestLevelHandle", handleMat.harvestLevel()); } - if (accessory != -1 && item.durabilityTypeAccessory() == 2) - { + if (accessory != -1 && item.durabilityTypeAccessory() == 2) { compound.getCompoundTag("InfiTool").setInteger("MiningSpeed2", accessoryMat.toolSpeed()); compound.getCompoundTag("InfiTool").setInteger("HarvestLevel2", accessoryMat.harvestLevel()); } - if (extra != -1 && item.durabilityTypeExtra() == 2) - { + if (extra != -1 && item.durabilityTypeExtra() == 2) { compound.getCompoundTag("InfiTool").setInteger("MiningSpeedExtra", extraMat.toolSpeed()); compound.getCompoundTag("InfiTool").setInteger("HarvestLevelExtra", extraMat.harvestLevel()); } - compound.getCompoundTag("InfiTool").setInteger("Unbreaking", buildReinforced(headMat, handleMat, accessoryMat, extraMat)); + compound.getCompoundTag("InfiTool") + .setInteger("Unbreaking", buildReinforced(headMat, handleMat, accessoryMat, extraMat)); compound.getCompoundTag("InfiTool").setFloat("Shoddy", buildShoddy(headMat, handleMat, accessoryMat, extraMat)); compound.getCompoundTag("InfiTool").setInteger("Modifiers", item.getModifierAmount()); - if (name != null && !name.equals("")) - { + if (name != null && !name.equals("")) { compound.setTag("display", new NBTTagCompound()); compound.getCompoundTag("display").setString("Name", "\u00A7f" + name); } // set a nice default name - else - { + else { compound.setTag("display", new NBTTagCompound()); compound.getCompoundTag("display").setString("Name", "\u00A7f" + defaultToolName(headMat, item)); } - ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(item, compound, new ToolMaterial[] { headMat, handleMat, accessoryMat, extraMat }); + ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool( + item, compound, new ToolMaterial[] {headMat, handleMat, accessoryMat, extraMat}); MinecraftForge.EVENT_BUS.post(event); - if (event.getResult() == Result.DEFAULT) - { + if (event.getResult() == Result.DEFAULT) { tool.setTagCompound(compound); - } - else if (event.getResult() == Result.ALLOW) - { + } else if (event.getResult() == Result.ALLOW) { tool = event.getResultStack(); - } - else - { + } else { tool = null; } @@ -375,78 +315,63 @@ public ItemStack modifyTool (ItemStack input, ItemStack topSlot, ItemStack botto return null; }*/ - int buildReinforced (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) - { + int buildReinforced( + ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) { int reinforced = 0; int dHead = headMat.reinforced(); int dHandle = handleMat.reinforced(); int dAccessory = 0; - if (accessoryMat != null) - dAccessory = accessoryMat.reinforced(); + if (accessoryMat != null) dAccessory = accessoryMat.reinforced(); int dExtra = 0; - if (extraMat != null) - dExtra = extraMat.reinforced(); - - if (dHead > reinforced) - reinforced = dHead; - if (dHandle > reinforced) - reinforced = dHandle; - if (dAccessory > reinforced) - reinforced = dAccessory; - if (dExtra > reinforced) - reinforced = dExtra; + if (extraMat != null) dExtra = extraMat.reinforced(); + + if (dHead > reinforced) reinforced = dHead; + if (dHandle > reinforced) reinforced = dHandle; + if (dAccessory > reinforced) reinforced = dAccessory; + if (dExtra > reinforced) reinforced = dExtra; return reinforced; } - float buildShoddy (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) - { + float buildShoddy(ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) { float sHead = headMat.shoddy(); float sHandle = handleMat.shoddy(); - if (extraMat != null) - { + if (extraMat != null) { float sAccessory = accessoryMat.shoddy(); float sExtra = extraMat.shoddy(); return (sHead + sHandle + sAccessory + sExtra) / 4f; } - if (accessoryMat != null) - { + if (accessoryMat != null) { float sAccessory = accessoryMat.shoddy(); return (sHead + sHandle + sAccessory) / 3f; } return (sHead + sHandle) / 2f; } - public static String defaultToolName (ItemStack stack) - { - if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) - return null; - if (!(stack.getItem() instanceof ToolCore)) - return null; + public static String defaultToolName(ItemStack stack) { + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) return null; + if (!(stack.getItem() instanceof ToolCore)) return null; int mat = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Head"); return defaultToolName(TConstructRegistry.getMaterial(mat), (ToolCore) stack.getItem()); } - public static String defaultToolName (ToolMaterial headMat, ToolCore tool) - { + public static String defaultToolName(ToolMaterial headMat, ToolCore tool) { String toolName = tool.getToolName().toLowerCase(); - String matName = headMat.materialName.toLowerCase().replaceAll(" ", "").replaceAll("_",""); - - if (StatCollector.canTranslate("tool." + toolName + "." + matName)) - { + String matName = headMat.materialName.toLowerCase().replaceAll(" ", "").replaceAll("_", ""); + + if (StatCollector.canTranslate("tool." + toolName + "." + matName)) { return StatCollector.translateToLocal("tool." + toolName + "." + matName); } - + return String.format("%s %s", headMat.prefixName(), tool.getLocalizedToolName()); } - //Passthrough for now + // Passthrough for now @Deprecated - public static void registerToolMod (ItemModifier mod) - { + public static void registerToolMod(ItemModifier mod) { ModifyBuilder.registerModifier(mod); } } diff --git a/src/main/java/tconstruct/library/crafting/ToolRecipe.java b/src/main/java/tconstruct/library/crafting/ToolRecipe.java index 8466fb9e1d9..07a8aac261d 100644 --- a/src/main/java/tconstruct/library/crafting/ToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ToolRecipe.java @@ -10,8 +10,7 @@ * Small class for checking if a particular tool combination is this one */ -public class ToolRecipe -{ +public class ToolRecipe { protected LinkedList headList = new LinkedList(); protected LinkedList handleList = new LinkedList(); protected LinkedList accessoryList = new LinkedList(); @@ -24,107 +23,78 @@ public class ToolRecipe * TContent.toolRod, null, null, tool); } */ - public ToolRecipe(Item head, Item handle, ToolCore tool) - { + public ToolRecipe(Item head, Item handle, ToolCore tool) { this(head, handle, null, null, tool); } - public ToolRecipe(Item head, Item handle, Item accessory, ToolCore tool) - { + public ToolRecipe(Item head, Item handle, Item accessory, ToolCore tool) { this(head, handle, accessory, null, tool); } - public ToolRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore tool) - { + public ToolRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore tool) { this.headList.add(head); this.handleList.add(handle); - if (accessory != null) - this.accessoryList.add(accessory); - if (extra != null) - this.extraList.add(extra); + if (accessory != null) this.accessoryList.add(accessory); + if (extra != null) this.extraList.add(extra); result = tool; } - public void addHeadItem (Item head) - { + public void addHeadItem(Item head) { this.headList.add(head); } - public void addHandleItem (Item head) - { + public void addHandleItem(Item head) { this.handleList.add(head); } - public void addAccessoryItem (Item head) - { + public void addAccessoryItem(Item head) { this.accessoryList.add(head); } - public void addExtraItem (Item head) - { + public void addExtraItem(Item head) { this.extraList.add(head); } - public boolean validHead (Item input) - { - for (Item part : headList) - { - if (part == input) - return true; + public boolean validHead(Item input) { + for (Item part : headList) { + if (part == input) return true; } return false; } - public boolean validHandle (Item input) - { - for (Item part : handleList) - { - if (part == input) - return true; - if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) - return true; + public boolean validHandle(Item input) { + for (Item part : handleList) { + if (part == input) return true; + if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) return true; } return false; } - public boolean validAccessory (Item input) - { - if (input == null) - { - if (accessoryList.size() < 1) - return true; + public boolean validAccessory(Item input) { + if (input == null) { + if (accessoryList.size() < 1) return true; return false; } - for (Item part : accessoryList) - { - if (part == input) - return true; - if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) - return true; + for (Item part : accessoryList) { + if (part == input) return true; + if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) return true; } return false; } - public boolean validExtra (Item input) - { - if (input == null) - { - if (extraList.size() < 1) - return true; + public boolean validExtra(Item input) { + if (input == null) { + if (extraList.size() < 1) return true; return false; } - for (Item part : extraList) - { - if (part == input) - return true; - if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) - return true; + for (Item part : extraList) { + if (part == input) return true; + if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) return true; } return false; } - public ToolCore getType () - { + public ToolCore getType() { return result; } } diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index 85d1189e954..ed85b51e59f 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -1,10 +1,9 @@ package tconstruct.library.entity; -import tconstruct.library.weaponry.AmmoItem; -import tconstruct.util.Reference; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; @@ -14,7 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; @@ -24,14 +22,14 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; +import tconstruct.library.weaponry.AmmoItem; +import tconstruct.util.Reference; import tconstruct.weaponry.entity.ArrowEntity; -import java.util.List; - // have to base this on EntityArrow, otherwise minecraft does derp things because everything is handled based on class. public abstract class ProjectileBase extends EntityArrow implements IEntityAdditionalSpawnData { - public final static String woodSound = Reference.resource("woodHit"); - public final static String stoneSound = Reference.resource("stoneHit"); + public static final String woodSound = Reference.resource("woodHit"); + public static final String stoneSound = Reference.resource("stoneHit"); public ItemStack returnStack; @@ -55,18 +53,25 @@ public ProjectileBase(World world, EntityPlayer player, float speed, float accur canBePickedUp = 1; // stuff from the arrow - this.setLocationAndAngles(player.posX, player.posY + (double)player.getEyeHeight(), player.posZ, player.rotationYaw, player.rotationPitch); + this.setLocationAndAngles( + player.posX, + player.posY + (double) player.getEyeHeight(), + player.posZ, + player.rotationYaw, + player.rotationPitch); this.setPosition(this.posX, this.posY, this.posZ); this.yOffset = 0.0F; - this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI); - this.motionZ = +MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI); - this.motionY = -MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI); + this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); + this.motionZ = +MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); + this.motionY = -MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI); this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, speed, accuracy); // our stuff returnStack = stack; -/* + /* // fix upward default angle motionY = -MathHelper.sin((rotationPitch / 180F) * 3.141593F - 0.2f); setArrowHeading(motionX, motionY, motionZ, speed, 0.0f); @@ -85,68 +90,66 @@ public ProjectileBase(World world, EntityPlayer player, float speed, float accur posZ += vz*1.5f; */ - //init(); + // init(); } - public ItemStack getEntityItem () - { + public ItemStack getEntityItem() { return returnStack; } - protected void playHitBlockSound(int x, int y, int z) - { - Block block = worldObj.getBlock(x,y,z); - if(block != null && block.blockMaterial == Material.wood) + protected void playHitBlockSound(int x, int y, int z) { + Block block = worldObj.getBlock(x, y, z); + if (block != null && block.blockMaterial == Material.wood) worldObj.playSoundAtEntity(this, woodSound, 1.0f, 1.0f); else { worldObj.playSoundAtEntity(this, stoneSound, 1.0f, 1.0f); } - if(block != null) - worldObj.playSoundAtEntity(this, block.stepSound.getBreakSound(), 0.7f, 1.0f); + if (block != null) worldObj.playSoundAtEntity(this, block.stepSound.getBreakSound(), 0.7f, 1.0f); } - protected void playHitEntitySound() - { - - } + protected void playHitEntitySound() {} /** * How deep the item enters stuff it hits. Should be bigger for bigger objects, and smaller for smaller objects. * 1.0f is exactly halfway in. */ - protected double getStuckDepth() { return 0.5f; } + protected double getStuckDepth() { + return 0.5f; + } - protected void doLivingHit(EntityLivingBase entityHit) - { - float knockback = returnStack.getTagCompound().getCompoundTag("InfiTool").getFloat("Knockback"); - if(shootingEntity instanceof EntityLivingBase) + protected void doLivingHit(EntityLivingBase entityHit) { + float knockback = + returnStack.getTagCompound().getCompoundTag("InfiTool").getFloat("Knockback"); + if (shootingEntity instanceof EntityLivingBase) knockback += EnchantmentHelper.getKnockbackModifier((EntityLivingBase) shootingEntity, entityHit); - if (!this.worldObj.isRemote) - { + if (!this.worldObj.isRemote) { entityHit.setArrowCountInEntity(entityHit.getArrowCountInEntity() + 1); } - if (knockback > 0) - { + if (knockback > 0) { double horizontalSpeed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - if (horizontalSpeed > 0.0F) - { - entityHit.addVelocity(this.motionX * (double) knockback * 0.6000000238418579D / horizontalSpeed, 0.1D, this.motionZ * (double) knockback * 0.6000000238418579D / (double) horizontalSpeed); + if (horizontalSpeed > 0.0F) { + entityHit.addVelocity( + this.motionX * (double) knockback * 0.6000000238418579D / horizontalSpeed, + 0.1D, + this.motionZ * (double) knockback * 0.6000000238418579D / (double) horizontalSpeed); } } - if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase) - { + if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase) { EnchantmentHelper.func_151384_a(entityHit, this.shootingEntity); - EnchantmentHelper.func_151385_b((EntityLivingBase)this.shootingEntity, entityHit); + EnchantmentHelper.func_151385_b((EntityLivingBase) this.shootingEntity, entityHit); } - if (this.shootingEntity != null && entityHit != this.shootingEntity && entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) - { - ((EntityPlayerMP)this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); + if (this.shootingEntity != null + && entityHit != this.shootingEntity + && entityHit instanceof EntityPlayer + && this.shootingEntity instanceof EntityPlayerMP) { + ((EntityPlayerMP) this.shootingEntity) + .playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); } } @@ -159,7 +162,9 @@ public void onHitBlock(MovingObjectPosition movingobjectposition) { this.motionX = movingobjectposition.hitVec.xCoord - this.posX; this.motionY = movingobjectposition.hitVec.yCoord - this.posY; this.motionZ = movingobjectposition.hitVec.zCoord - this.posZ; - double speed = getStuckDepth() * MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + double speed = getStuckDepth() + * MathHelper.sqrt_double( + this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); this.posX -= this.motionX / speed * 0.05000000074505806D; this.posY -= this.motionY / speed * 0.05000000074505806D; this.posZ -= this.motionZ / speed * 0.05000000074505806D; @@ -171,36 +176,36 @@ public void onHitBlock(MovingObjectPosition movingobjectposition) { this.setIsCritical(false); this.defused = true; // defuse it so it doesn't hit stuff anymore, being weird - if (this.field_145790_g.getMaterial() != Material.air) - { - this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); + if (this.field_145790_g.getMaterial() != Material.air) { + this.field_145790_g.onEntityCollidedWithBlock( + this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); } } public void onHitEntity(MovingObjectPosition movingobjectposition) { NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool"); - float speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + float speed = MathHelper.sqrt_double( + this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); // absolute distance travelled minus the current tick - float distance = speed * (this.ticksInAir-1); + float distance = speed * (this.ticksInAir - 1); // distance travelled in the current tick float dist2 = 0; - dist2 += MathHelper.abs((float)movingobjectposition.entityHit.lastTickPosX - (float)this.lastTickPosX); - dist2 += MathHelper.abs((float)movingobjectposition.entityHit.lastTickPosY - (float)this.lastTickPosY); - dist2 += MathHelper.abs((float)movingobjectposition.entityHit.lastTickPosZ - (float)this.lastTickPosZ); + dist2 += MathHelper.abs((float) movingobjectposition.entityHit.lastTickPosX - (float) this.lastTickPosX); + dist2 += MathHelper.abs((float) movingobjectposition.entityHit.lastTickPosY - (float) this.lastTickPosY); + dist2 += MathHelper.abs((float) movingobjectposition.entityHit.lastTickPosZ - (float) this.lastTickPosZ); dist2 = MathHelper.sqrt_double(dist2); distance += dist2; - if(!tags.hasKey("BaseAttack")) - { + if (!tags.hasKey("BaseAttack")) { // quickly calculate the base attack damage from the actual attack damage and quartz modifiers - // yes, this relies on quartz being the only modifier that modifiers damage, but at the point of writing this + // yes, this relies on quartz being the only modifier that modifiers damage, but at the point of writing + // this // that is the case, and later tools should have the tag int atk = tags.getInteger("Attack"); - if(tags.hasKey("ModAttack")) - { - int bonusDmg = tags.getIntArray("ModAttack")[0]/24 + 1; + if (tags.hasKey("ModAttack")) { + int bonusDmg = tags.getIntArray("ModAttack")[0] / 24 + 1; atk -= bonusDmg; } tags.setInteger("BaseAttack", atk); @@ -208,65 +213,79 @@ public void onHitEntity(MovingObjectPosition movingobjectposition) { float baseAttack = tags.getInteger("BaseAttack"); float totalAttack = tags.getInteger("Attack"); - float damage = speed * baseAttack; // todo: potentially change this back to MathHelper.ceiling_float_int to get 1/2 heart steps back + float damage = speed + * baseAttack; // todo: potentially change this back to MathHelper.ceiling_float_int to get 1/2 heart + // steps back // add quartz damage damage += (totalAttack - baseAttack); // this is needed so really high scaling bow&arrow combinations don't get out of hand - if(this instanceof ArrowEntity) - damage = Math.max(0, damage - totalAttack/2f); + if (this instanceof ArrowEntity) damage = Math.max(0, damage - totalAttack / 2f); boolean shotByPlayer = this.shootingEntity != null && this.shootingEntity instanceof EntityPlayer; // Damage calculations and stuff. For reference see AbilityHelper.onLeftClickEntity - ToolCore ammo = (ToolCore)returnStack.getItem(); + ToolCore ammo = (ToolCore) returnStack.getItem(); // factor in modified stuff for base damage // basically we pass the base damage to all modifiers and take the highest one int baseDamage = 0; - if(shotByPlayer) // prevent crashes with other things reflecting/shooting them - for(ActiveToolMod toolmod : TConstructRegistry.activeModifiers) { - int dmg = toolmod.baseAttackDamage(baseDamage, (int)damage, ammo, returnStack.getTagCompound(), tags, returnStack, (EntityPlayer)this.shootingEntity, movingobjectposition.entityHit); - if(dmg > baseDamage) - baseDamage = dmg; + if (shotByPlayer) // prevent crashes with other things reflecting/shooting them + for (ActiveToolMod toolmod : TConstructRegistry.activeModifiers) { + int dmg = toolmod.baseAttackDamage( + baseDamage, + (int) damage, + ammo, + returnStack.getTagCompound(), + tags, + returnStack, + (EntityPlayer) this.shootingEntity, + movingobjectposition.entityHit); + if (dmg > baseDamage) baseDamage = dmg; } damage += baseDamage; // damage modification from the weapon itself damage *= ammo.getDamageModifier(); - // unlike the regular weapons, we do no gain more damage from potion of strength/weakness since we don't hit stuff directly + // unlike the regular weapons, we do no gain more damage from potion of strength/weakness since we don't hit + // stuff directly // stonebound decreases, jagged increases damage too float bonusDamage = -AbilityHelper.calcStoneboundBonus(ammo, tags); // enchantments might add too - if(shootingEntity != null && movingobjectposition.entityHit instanceof EntityLivingBase) - bonusDamage += EnchantmentHelper.getEnchantmentModifierLiving((EntityLivingBase)this.shootingEntity, (EntityLivingBase)movingobjectposition.entityHit); + if (shootingEntity != null && movingobjectposition.entityHit instanceof EntityLivingBase) + bonusDamage += EnchantmentHelper.getEnchantmentModifierLiving( + (EntityLivingBase) this.shootingEntity, (EntityLivingBase) movingobjectposition.entityHit); damage += bonusDamage; // ensure we still have damage - if(damage < 1) - damage = 1; + if (damage < 1) damage = 1; // the regular tool modifier damage stuff int modDamage = 0; - if(shotByPlayer) - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - modDamage += mod.attackDamage(modDamage, (int)damage, ammo, returnStack.getTagCompound(), tags, returnStack, (EntityPlayer)this.shootingEntity, movingobjectposition.entityHit); + if (shotByPlayer) + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + modDamage += mod.attackDamage( + modDamage, + (int) damage, + ammo, + returnStack.getTagCompound(), + tags, + returnStack, + (EntityPlayer) this.shootingEntity, + movingobjectposition.entityHit); } damage += modDamage; // calculate critical damaaage if (this.getIsCritical()) - damage += (this.rand.nextFloat()/4f + Math.min(0.75f, distance/25f)) * (damage / 2f + 2f); + damage += (this.rand.nextFloat() / 4f + Math.min(0.75f, distance / 25f)) * (damage / 2f + 2f); // and now we come to the part where we actually deal the damage! - if(!dealDamage(damage, ammo, tags, movingobjectposition.entityHit)) - { - if(!bounceOnNoDamage) - this.setDead(); + if (!dealDamage(damage, ammo, tags, movingobjectposition.entityHit)) { + if (!bounceOnNoDamage) this.setDead(); // bounce off if we didn't deal damage this.motionX *= -0.10000000149011612D; @@ -278,46 +297,38 @@ public void onHitEntity(MovingObjectPosition movingobjectposition) { return; } // we hit it, BURNNNNNN - else - AbilityHelper.processFiery(shootingEntity, movingobjectposition.entityHit, tags); - + else AbilityHelper.processFiery(shootingEntity, movingobjectposition.entityHit, tags); if (movingobjectposition.entityHit instanceof EntityLivingBase) - doLivingHit((EntityLivingBase)movingobjectposition.entityHit); + doLivingHit((EntityLivingBase) movingobjectposition.entityHit); playHitEntitySound(); - if (!(movingobjectposition.entityHit instanceof EntityEnderman)) - { + if (!(movingobjectposition.entityHit instanceof EntityEnderman)) { // reinforced helps for them to not break! - if(rand.nextInt(10)+1 > tags.getInteger("Reinforced")) - this.setDead(); - else - { - this.motionX = Math.max(-0.1,Math.min(0.1, -motionX)); + if (rand.nextInt(10) + 1 > tags.getInteger("Reinforced")) this.setDead(); + else { + this.motionX = Math.max(-0.1, Math.min(0.1, -motionX)); this.motionY = 0.2; - this.motionZ = Math.max(-0.1,Math.min(0.1, -motionZ)); + this.motionZ = Math.max(-0.1, Math.min(0.1, -motionZ)); this.ticksInAir = 0; this.posX = movingobjectposition.entityHit.posX; - this.posY = movingobjectposition.entityHit.posY + movingobjectposition.entityHit.height/2d; + this.posY = movingobjectposition.entityHit.posY + movingobjectposition.entityHit.height / 2d; this.posZ = movingobjectposition.entityHit.posZ; this.defused = true; - //this.shootingEntity = movingobjectposition.entityHit; + // this.shootingEntity = movingobjectposition.entityHit; } } } // returns true if it was successful - public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Entity entityHit) - { + public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Entity entityHit) { boolean dealtDamage = false; // deal regular damage DamageSource damagesource; - if (this.shootingEntity == null) - damagesource = DamageSource.causeArrowDamage(this, this); - else - damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); + if (this.shootingEntity == null) damagesource = DamageSource.causeArrowDamage(this, this); + else damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); dealtDamage = entityHit.attackEntityFrom(damagesource, damage); return dealtDamage; @@ -326,7 +337,8 @@ public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Enti @Override public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) { // don't do anything, we set it ourselves at spawn - // Mojangs code has a hard cap of 3.9 speed, but our projectiles can go faster, which desyncs client and server speeds + // Mojangs code has a hard cap of 3.9 speed, but our projectiles can go faster, which desyncs client and server + // speeds // Packet that's causing it: S12PacketEntityVelocity } @@ -334,75 +346,71 @@ public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) // this function is the same as the vanilla EntityArrow public void onUpdate() { // call the entity update routine - // luckily we can call this directly and take the arrow-code, since we'd have to call super.onUpdate otherwise. Which would not work. + // luckily we can call this directly and take the arrow-code, since we'd have to call super.onUpdate otherwise. + // Which would not work. onEntityUpdate(); // boioioiooioing - if (this.arrowShake > 0) - --this.arrowShake; + if (this.arrowShake > 0) --this.arrowShake; // If we don't have our rotation set correctly, infer it from our motion direction - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) - { + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); + this.prevRotationYaw = + this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.prevRotationPitch = + this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); } // we previously hit something. Check if the block is still there. Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); - if (block.getMaterial() != Material.air) - { - block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + if (block.getMaterial() != Material.air) { + block.setBlockBoundsBasedOnState( + this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool( + this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); // we are stuck in a block. yay. - if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) + if (axisalignedbb != null + && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) this.inGround = true; } - if (this.inGround) - updateInGround(); - else - updateInAir(); + if (this.inGround) updateInGround(); + else updateInAir(); } // Update while we're stuck in a block - protected void updateInGround() - { + protected void updateInGround() { Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); int j = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); // check if it's still the same block - if (block == this.field_145790_g && j == this.inData) - { + if (block == this.field_145790_g && j == this.inData) { ++this.ticksInGround; - if (this.ticksInGround == 1200) - { + if (this.ticksInGround == 1200) { this.setDead(); } - } - else - { + } else { this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.motionX *= (double) (this.rand.nextFloat() * 0.2F); + this.motionY *= (double) (this.rand.nextFloat() * 0.2F); + this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); this.ticksInGround = 0; this.ticksInAir = 0; } } // update while traveling - protected void updateInAir() - { + protected void updateInAir() { // tick tock ++this.ticksInAir; // do a raytrace from old to new position Vec3 curPos = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 newPos = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 newPos = + Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(curPos, newPos, false, true, false); // raytrace messes with the positions. get new ones! @@ -410,24 +418,29 @@ protected void updateInAir() // if we hit something, the collision point is our new position if (movingobjectposition != null) - newPos = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + newPos = Vec3.createVectorHelper( + movingobjectposition.hitVec.xCoord, + movingobjectposition.hitVec.yCoord, + movingobjectposition.hitVec.zCoord); else - newPos = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - + newPos = Vec3.createVectorHelper( + this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - if(!defused) { + if (!defused) { // Check all the entities we on our way Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( + this, + this.boundingBox + .addCoord(this.motionX, this.motionY, this.motionZ) + .expand(1.0D, 1.0D, 1.0D)); double distance = 0.0D; float f1; for (Entity ent : list) { - if (!ent.canBeCollidedWith()) - continue; + if (!ent.canBeCollidedWith()) continue; // we don't shoot ourselves into the foot. - if (ent == this.shootingEntity && this.ticksInAir < 5) - continue; + if (ent == this.shootingEntity && this.ticksInAir < 5) continue; f1 = 0.3F; AxisAlignedBB axisalignedbb1 = ent.boundingBox.expand((double) f1, (double) f1, (double) f1); @@ -446,54 +459,57 @@ protected void updateInAir() } // if we hit something, new collision point! - if (entity != null) - movingobjectposition = new MovingObjectPosition(entity); + if (entity != null) movingobjectposition = new MovingObjectPosition(entity); // did we hit a player? - if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { + if (movingobjectposition != null + && movingobjectposition.entityHit != null + && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; // can we attack said player? - if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) + if (entityplayer.capabilities.disableDamage + || this.shootingEntity instanceof EntityPlayer + && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) movingobjectposition = null; // this check should probably done inside of the loop for accuracy.. } } - // time to hit the object if (movingobjectposition != null) { - if (movingobjectposition.entityHit != null) - onHitEntity(movingobjectposition); - else - onHitBlock(movingobjectposition); + if (movingobjectposition.entityHit != null) onHitEntity(movingobjectposition); + else onHitBlock(movingobjectposition); } // crithit particles - if (this.getIsCritical()) - drawCritParticles(); + if (this.getIsCritical()) drawCritParticles(); // MOVEMENT! yay. doMoveUpdate(); double slowdown = 1.0d - getSlowdown(); // bubblez - if (this.isInWater()) - { - for (int l = 0; l < 4; ++l) - { + if (this.isInWater()) { + for (int l = 0; l < 4; ++l) { float f4 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)f4, this.posY - this.motionY * (double)f4, this.posZ - this.motionZ * (double)f4, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle( + "bubble", + this.posX - this.motionX * (double) f4, + this.posY - this.motionY * (double) f4, + this.posZ - this.motionZ * (double) f4, + this.motionX, + this.motionY, + this.motionZ); } // more slowdown in water - slowdown = 1d - 20d*getSlowdown(); + slowdown = 1d - 20d * getSlowdown(); } // phshshshshshs - if (this.isWet()) - this.extinguish(); + if (this.isWet()) this.extinguish(); // minimalistic slowdown! this.motionX *= slowdown; @@ -507,35 +523,35 @@ protected void updateInAir() this.func_145775_I(); } - public void drawCritParticles() - { - for (int i = 0; i < 4; ++i) - { - this.worldObj.spawnParticle("crit", this.posX + this.motionX * (double)i / 4.0D, this.posY + this.motionY * (double)i / 4.0D, this.posZ + this.motionZ * (double)i / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); + public void drawCritParticles() { + for (int i = 0; i < 4; ++i) { + this.worldObj.spawnParticle( + "crit", + this.posX + this.motionX * (double) i / 4.0D, + this.posY + this.motionY * (double) i / 4.0D, + this.posZ + this.motionZ * (double) i / 4.0D, + -this.motionX, + -this.motionY + 0.2D, + -this.motionZ); } } - protected void doMoveUpdate() - { + protected void doMoveUpdate() { this.posX += this.motionX; this.posY += this.motionY; this.posZ += this.motionZ; double f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.rotationPitch = (float)(Math.atan2(this.motionY, f2) * 180.0D / Math.PI); + this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationPitch = (float) (Math.atan2(this.motionY, f2) * 180.0D / Math.PI); // normalize rotations - while (this.rotationPitch - this.prevRotationPitch < -180.0F) - this.prevRotationPitch -= 360.0F; + while (this.rotationPitch - this.prevRotationPitch < -180.0F) this.prevRotationPitch -= 360.0F; - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) - this.prevRotationPitch += 360.0F; + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) this.prevRotationPitch += 360.0F; - while (this.rotationYaw - this.prevRotationYaw < -180.0F) - this.prevRotationYaw -= 360.0F; + while (this.rotationYaw - this.prevRotationYaw < -180.0F) this.prevRotationYaw -= 360.0F; - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) - this.prevRotationYaw += 360.0F; + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) this.prevRotationYaw += 360.0F; this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; @@ -544,58 +560,54 @@ protected void doMoveUpdate() /** * Factor for the slowdown. 0 = no slowdown, >0 = (1-slowdown)*speed slowdown, <0 = speedup */ - protected double getSlowdown() { return 0.01; } + protected double getSlowdown() { + return 0.01; + } /** * Added to the y-velocity as gravitational pull. Otherwise stuff would simply float midair. */ - protected double getGravity() { return 0.05; } + protected double getGravity() { + return 0.05; + } /** * Called by a player entity when they collide with an entity */ - public void onCollideWithPlayer(EntityPlayer player) - { - if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) - { + public void onCollideWithPlayer(EntityPlayer player) { + if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && player.capabilities.isCreativeMode; - if (this.canBePickedUp == 1) - { + if (this.canBePickedUp == 1) { // ammo pickup - if(this.returnStack != null && this.returnStack.getItem() instanceof AmmoItem) - { - if(!((AmmoItem) this.returnStack.getItem()).pickupAmmo(returnStack, null, player)) - flag = false; + if (this.returnStack != null && this.returnStack.getItem() instanceof AmmoItem) { + if (!((AmmoItem) this.returnStack.getItem()).pickupAmmo(returnStack, null, player)) flag = false; } // regular pickup. - // Note that you can't pick up ammo items without the proper itemstack in your inventory to prevent dupes - else if(returnStack != null && !player.inventory.addItemStackToInventory(returnStack)) - { + // Note that you can't pick up ammo items without the proper itemstack in your inventory to prevent + // dupes + else if (returnStack != null && !player.inventory.addItemStackToInventory(returnStack)) { flag = false; } } - if (flag) - { - this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + if (flag) { + this.playSound( + "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); player.onItemPickup(this, 1); this.setDead(); } } } - /** NBT stuff **/ - @Override - public void writeEntityToNBT (NBTTagCompound tags) - { + public void writeEntityToNBT(NBTTagCompound tags) { super.writeEntityToNBT(tags); tags.setTag("Throwable", this.returnStack.writeToNBT(new NBTTagCompound())); tags.setByte("onGround", (byte) (onGround ? 1 : 0)); - //tags.setBoolean("Retrieval", doNotRetrieve); + // tags.setBoolean("Retrieval", doNotRetrieve); } @Override @@ -604,10 +616,10 @@ public void readEntityFromNBT(NBTTagCompound tags) { this.returnStack = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("Throwable")); onGround = tags.getByte("onGround") == 1; - //doNotRetrieve = tags.getBoolean("Retrieval"); + // doNotRetrieve = tags.getBoolean("Retrieval"); // ensure that nothing can crash because something went wrong in the world... - if(this.returnStack == null || !(this.returnStack.getItem() instanceof ToolCore)) { + if (this.returnStack == null || !(this.returnStack.getItem() instanceof ToolCore)) { this.setDead(); } } @@ -636,10 +648,10 @@ public void readSpawnData(ByteBuf data) { this.motionX = data.readDouble(); this.motionY = data.readDouble(); this.motionZ = data.readDouble(); - + // position offset so it doesn't shoot from the player's eyes - this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F; + this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; this.posY -= 0.10000000149011612D; - this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F; + this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; } } diff --git a/src/main/java/tconstruct/library/event/ModifyEvent.java b/src/main/java/tconstruct/library/event/ModifyEvent.java index 536d94c3cd6..35279f127e8 100644 --- a/src/main/java/tconstruct/library/event/ModifyEvent.java +++ b/src/main/java/tconstruct/library/event/ModifyEvent.java @@ -3,7 +3,6 @@ import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; diff --git a/src/main/java/tconstruct/library/event/PartBuilderEvent.java b/src/main/java/tconstruct/library/event/PartBuilderEvent.java index ab3ca23674e..f6c4290d8d8 100644 --- a/src/main/java/tconstruct/library/event/PartBuilderEvent.java +++ b/src/main/java/tconstruct/library/event/PartBuilderEvent.java @@ -3,47 +3,40 @@ import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; -/* This event fires after all of the other construction. The resulting nbttag is added to the tool +/* This event fires after all of the other construction. The resulting nbttag is added to the tool * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. */ -public class PartBuilderEvent extends Event -{ +public class PartBuilderEvent extends Event { public final ItemStack material; public final ItemStack pattern; public final ItemStack otherPattern; protected ItemStack[] resultStacks; - public PartBuilderEvent(ItemStack material, ItemStack pattern, ItemStack otherPattern) - { + public PartBuilderEvent(ItemStack material, ItemStack pattern, ItemStack otherPattern) { this.material = material; this.pattern = pattern; this.otherPattern = otherPattern; } @HasResult - public static class NormalPart extends PartBuilderEvent - { - public NormalPart(ItemStack material, ItemStack pattern, ItemStack otherPattern) - { + public static class NormalPart extends PartBuilderEvent { + public NormalPart(ItemStack material, ItemStack pattern, ItemStack otherPattern) { super(material, pattern, otherPattern); } /** * Fires before other processing is done - * + * * Result is significant: DEFAULT: Allows part to be crafted normally * ALLOW: Uses resultStack instead DENY: Stops part crafting altogether */ - - public void overrideResult (ItemStack[] result) - { + public void overrideResult(ItemStack[] result) { resultStacks = result; this.setResult(Result.ALLOW); } - public ItemStack[] getResultStacks () - { + public ItemStack[] getResultStacks() { return resultStacks; } } diff --git a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java index bbbdf30148e..c384bc7c4aa 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java @@ -9,29 +9,23 @@ * * Set result to DENY to prevent casting. */ -public abstract class SmelteryCastEvent extends Event -{ +public abstract class SmelteryCastEvent extends Event { public final CastingRecipe recipe; public final FluidStack fluid; - public SmelteryCastEvent(CastingRecipe recipe, FluidStack fluid) - { + public SmelteryCastEvent(CastingRecipe recipe, FluidStack fluid) { this.recipe = recipe; this.fluid = fluid; } - public static class CastingTable extends SmelteryCastEvent - { - public CastingTable(CastingRecipe recipe, FluidStack fluid) - { + public static class CastingTable extends SmelteryCastEvent { + public CastingTable(CastingRecipe recipe, FluidStack fluid) { super(recipe, fluid); } } - public static class CastingBasin extends SmelteryCastEvent - { - public CastingBasin(CastingRecipe recipe, FluidStack fluid) - { + public static class CastingBasin extends SmelteryCastEvent { + public CastingBasin(CastingRecipe recipe, FluidStack fluid) { super(recipe, fluid); } } diff --git a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java index 0c498dce085..f8e14ca4d2a 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java @@ -8,31 +8,25 @@ * Fired when an item is cast in the casting table. * If consumeCast is set to true, the cast will be destroyed. */ -public abstract class SmelteryCastedEvent extends Event -{ +public abstract class SmelteryCastedEvent extends Event { public final CastingRecipe recipe; public ItemStack output; public boolean consumeCast; - public SmelteryCastedEvent(CastingRecipe recipe, ItemStack output) - { + public SmelteryCastedEvent(CastingRecipe recipe, ItemStack output) { this.recipe = recipe; this.consumeCast = recipe.consumeCast; this.output = output; } - public static class CastingTable extends SmelteryCastedEvent - { - public CastingTable(CastingRecipe recipe, ItemStack output) - { + public static class CastingTable extends SmelteryCastedEvent { + public CastingTable(CastingRecipe recipe, ItemStack output) { super(recipe, output); } } - public static class CastingBasin extends SmelteryCastedEvent - { - public CastingBasin(CastingRecipe recipe, ItemStack output) - { + public static class CastingBasin extends SmelteryCastedEvent { + public CastingBasin(CastingRecipe recipe, ItemStack output) { super(recipe, output); } } diff --git a/src/main/java/tconstruct/library/event/SmelteryEvent.java b/src/main/java/tconstruct/library/event/SmelteryEvent.java index 6a90d10b48b..90c4f54a52f 100644 --- a/src/main/java/tconstruct/library/event/SmelteryEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryEvent.java @@ -6,14 +6,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public class SmelteryEvent extends Event -{ +public class SmelteryEvent extends Event { public InventoryLogic component; public int x, y, z; - public SmelteryEvent(InventoryLogic component, int x, int y, int z) - { + public SmelteryEvent(InventoryLogic component, int x, int y, int z) { this.component = component; this.x = x; this.y = y; @@ -21,32 +19,31 @@ public SmelteryEvent(InventoryLogic component, int x, int y, int z) } @Cancelable - public static class ItemInsertedIntoCasting extends SmelteryEvent - { + public static class ItemInsertedIntoCasting extends SmelteryEvent { /** Item that will be inserted into the casting block */ public ItemStack item; + public EntityPlayer player; - public ItemInsertedIntoCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) - { + public ItemInsertedIntoCasting( + InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) { super(component, x, y, z); this.item = item; this.player = player; } } - public static class ItemRemovedFromCasting extends SmelteryEvent - { + public static class ItemRemovedFromCasting extends SmelteryEvent { /** Item that will be returned to the player */ public ItemStack item; + public EntityPlayer player; - public ItemRemovedFromCasting(InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) - { + public ItemRemovedFromCasting( + InventoryLogic component, int x, int y, int z, ItemStack item, EntityPlayer player) { super(component, x, y, z); this.item = item; this.player = player; } } - } diff --git a/src/main/java/tconstruct/library/event/ToolBuildEvent.java b/src/main/java/tconstruct/library/event/ToolBuildEvent.java index 94c1575648e..6ed7c0bf4d7 100644 --- a/src/main/java/tconstruct/library/event/ToolBuildEvent.java +++ b/src/main/java/tconstruct/library/event/ToolBuildEvent.java @@ -7,16 +7,15 @@ * Called when the ToolBuilder tries to piece together the Parts of a tool. * */ -public class ToolBuildEvent extends Event -{ +public class ToolBuildEvent extends Event { public ItemStack headStack; public ItemStack handleStack; public ItemStack accessoryStack; public ItemStack extraStack; public String name; // to allow shenanigans - public ToolBuildEvent(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) - { + public ToolBuildEvent( + ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) { this.headStack = headStack; this.handleStack = handleStack; this.accessoryStack = accessoryStack; diff --git a/src/main/java/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java index 927ca433300..304cfa603cb 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftEvent.java @@ -5,47 +5,40 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.*; -/* This event fires after all of the other construction. The resulting nbttag is added to the tool +/* This event fires after all of the other construction. The resulting nbttag is added to the tool * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. */ -public class ToolCraftEvent extends Event -{ +public class ToolCraftEvent extends Event { public final ToolCore tool; public final NBTTagCompound toolTag; public final ToolMaterial[] materials; protected ItemStack resultStack; - public ToolCraftEvent(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) - { + public ToolCraftEvent(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) { this.tool = tool; this.toolTag = toolTag; this.materials = materials; } @HasResult - public static class NormalTool extends ToolCraftEvent - { - public NormalTool(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) - { + public static class NormalTool extends ToolCraftEvent { + public NormalTool(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) { super(tool, toolTag, materials); } /** * Fires just before the tool is put together - * + * * Result is significant: DEFAULT: Allows tool to be crafted normally * ALLOW: Uses resultStack instead DENY: Stops tool crafting altogether */ - - public void overrideResult (ItemStack result) - { + public void overrideResult(ItemStack result) { resultStack = result; this.setResult(Result.ALLOW); } - public ItemStack getResultStack () - { + public ItemStack getResultStack() { return resultStack; } } diff --git a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java index 07053c36de9..da22b67f0c6 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java @@ -5,18 +5,15 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class ToolCraftedEvent extends Event -{ +public class ToolCraftedEvent extends Event { public IInventory inventory; public EntityPlayer player; public ItemStack tool; - public ToolCraftedEvent(IInventory inventory, EntityPlayer player, ItemStack tool) - { + public ToolCraftedEvent(IInventory inventory, EntityPlayer player, ItemStack tool) { this.inventory = inventory; this.player = player; this.tool = tool; } - } diff --git a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java index 1e7ccc062e7..74b903c8ed1 100644 --- a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java +++ b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java @@ -5,11 +5,7 @@ import net.minecraft.world.World; import tconstruct.library.armor.*; -public class ActiveArmorMod -{ +public class ActiveArmorMod { /* Ticks for every armor piece on client and server */ - public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) - { - - } + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) {} } diff --git a/src/main/java/tconstruct/library/modifier/IModifyable.java b/src/main/java/tconstruct/library/modifier/IModifyable.java index 24cdbfd2412..16214742191 100644 --- a/src/main/java/tconstruct/library/modifier/IModifyable.java +++ b/src/main/java/tconstruct/library/modifier/IModifyable.java @@ -1,13 +1,12 @@ package tconstruct.library.modifier; -public interface IModifyable -{ +public interface IModifyable { /** * @return The base tag to modify. Ex: InfiTool */ - public String getBaseTagName (); + public String getBaseTagName(); - public String getModifyType (); + public String getModifyType(); - public String[] getTraits (); + public String[] getTraits(); } diff --git a/src/main/java/tconstruct/library/modifier/ItemModifier.java b/src/main/java/tconstruct/library/modifier/ItemModifier.java index ea43d01bd76..e5e39508387 100644 --- a/src/main/java/tconstruct/library/modifier/ItemModifier.java +++ b/src/main/java/tconstruct/library/modifier/ItemModifier.java @@ -4,25 +4,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public abstract class ItemModifier -{ +public abstract class ItemModifier { public final String key; public final List stacks; public final int effectIndex; public static Random random = new Random(); /** Default constructor - * + * * @param recipe Items to compare against when checking the modifier * @param effect Render index for sprite layering * @param dataKey NBT string to put on the item */ - - public ItemModifier(ItemStack[] recipe, int effect, String dataKey) - { + public ItemModifier(ItemStack[] recipe, int effect, String dataKey) { List itemstacks = new ArrayList(); - for (int iter = 0; iter < recipe.length; iter++) - itemstacks.add(recipe[iter]); + for (int iter = 0; iter < recipe.length; iter++) itemstacks.add(recipe[iter]); stacks = itemstacks; effectIndex = effect; key = dataKey; @@ -30,41 +26,36 @@ public ItemModifier(ItemStack[] recipe, int effect, String dataKey) /** Checks to see if the inputs match the stored items * Note: Works like ShapelessRecipes - * + * * @param recipe The ItemStacks to compare against * @param input Item to modify, used for restrictions * @return Whether the recipe matches the input */ - public boolean matches (ItemStack[] recipe, ItemStack input) - { - if (!canModify(input, recipe)) - return false; + public boolean matches(ItemStack[] recipe, ItemStack input) { + if (!canModify(input, recipe)) return false; ArrayList list = new ArrayList(this.stacks); - for (int iter = 0; iter < recipe.length; ++iter) - { + for (int iter = 0; iter < recipe.length; ++iter) { ItemStack craftingStack = recipe[iter]; - if (craftingStack != null) - { + if (craftingStack != null) { boolean canCraft = false; Iterator iterate = list.iterator(); - while (iterate.hasNext()) - { + while (iterate.hasNext()) { ItemStack removeStack = (ItemStack) iterate.next(); - if (craftingStack.getItem() == removeStack.getItem() && (removeStack.getItemDamage() == Short.MAX_VALUE || craftingStack.getItemDamage() == removeStack.getItemDamage())) - { + if (craftingStack.getItem() == removeStack.getItem() + && (removeStack.getItemDamage() == Short.MAX_VALUE + || craftingStack.getItemDamage() == removeStack.getItemDamage())) { canCraft = true; list.remove(removeStack); break; } } - if (!canCraft) - { + if (!canCraft) { return false; } } @@ -73,13 +64,11 @@ public boolean matches (ItemStack[] recipe, ItemStack input) return list.isEmpty(); } - protected String getTagName (ItemStack stack) - { + protected String getTagName(ItemStack stack) { return ((IModifyable) stack.getItem()).getBaseTagName(); } - protected NBTTagCompound getModifierTag (ItemStack stack) - { + protected NBTTagCompound getModifierTag(ItemStack stack) { return stack.getTagCompound().getCompoundTag(getTagName(stack)); } @@ -88,63 +77,44 @@ protected NBTTagCompound getModifierTag (ItemStack stack) * @param recipe Items to modify with * @return Whether the tool can be modified */ - - protected boolean canModify (ItemStack input, ItemStack[] recipe) - { + protected boolean canModify(ItemStack input, ItemStack[] recipe) { NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); return tags.getInteger("Modifiers") > 0; } /** Modifies the tool. Adds nbttags, changes existing ones, ticks down modification counter, etc - * + * * @param recipe ItemStacks to pull info from * @param input The tool to modify */ - public abstract void modify (ItemStack[] recipe, ItemStack input); + public abstract void modify(ItemStack[] recipe, ItemStack input); - public void addMatchingEffect (ItemStack input) - { + public void addMatchingEffect(ItemStack input) { NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); - if (tags.hasKey("Effect6") || tags.hasKey(key)) - return; - - else if (tags.hasKey("Effect5")) - { + if (tags.hasKey("Effect6") || tags.hasKey(key)) return; + else if (tags.hasKey("Effect5")) { tags.setInteger("Effect6", effectIndex); - } - else if (tags.hasKey("Effect4")) - { + } else if (tags.hasKey("Effect4")) { tags.setInteger("Effect5", effectIndex); - } - else if (tags.hasKey("Effect3")) - { + } else if (tags.hasKey("Effect3")) { tags.setInteger("Effect4", effectIndex); - } - else if (tags.hasKey("Effect2")) - { + } else if (tags.hasKey("Effect2")) { tags.setInteger("Effect3", effectIndex); - } - else if (tags.hasKey("Effect1")) - { + } else if (tags.hasKey("Effect1")) { tags.setInteger("Effect2", effectIndex); - } - else - { + } else { tags.setInteger("Effect1", effectIndex); } } - //Gui - protected int addModifierTip (ItemStack input, String modifierTip) - { + // Gui + protected int addModifierTip(ItemStack input, String modifierTip) { NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); int tipNum = 0; - while (true) - { + while (true) { tipNum++; String tip = "Tooltip" + tipNum; - if (!tags.hasKey(tip)) - { + if (!tags.hasKey(tip)) { tags.setString(tip, ""); String modTip = "ModifierTip" + tipNum; tags.setString(modTip, modifierTip); @@ -153,27 +123,21 @@ protected int addModifierTip (ItemStack input, String modifierTip) } } - //Item - protected int addToolTip (ItemStack input, String tooltip, String modifierTip) - { + // Item + protected int addToolTip(ItemStack input, String tooltip, String modifierTip) { NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); int tipNum = 0; - while (true) - { + while (true) { tipNum++; String tip = "Tooltip" + tipNum; - if (!tags.hasKey(tip)) - { + if (!tags.hasKey(tip)) { tags.setString(tip, tooltip); String modTip = "ModifierTip" + tipNum; tags.setString(modTip, modifierTip); return tipNum; - } - else - { + } else { String tag = tags.getString(tip); - if (tag.contains(tooltip)) - { + if (tag.contains(tooltip)) { tags.setString(tip, getProperName(tooltip, tag)); String modTip = "ModifierTip" + tipNum; tag = tags.getString(modTip); @@ -184,70 +148,53 @@ protected int addToolTip (ItemStack input, String tooltip, String modifierTip) } } - protected String getProperName (String tooltip, String tag) - { - if (tag.isEmpty()) - return tooltip + " I"; + protected String getProperName(String tooltip, String tag) { + if (tag.isEmpty()) return tooltip + " I"; - if (tag.equals(tooltip) || tag.equals(tooltip + " I")) - return tooltip + " II"; + if (tag.equals(tooltip) || tag.equals(tooltip + " I")) return tooltip + " II"; - if (tag.equals(tooltip + " II")) - return tooltip + " III"; + if (tag.equals(tooltip + " II")) return tooltip + " III"; - if (tag.equals(tooltip + " III")) - return tooltip + " IV"; + if (tag.equals(tooltip + " III")) return tooltip + " IV"; - if (tag.equals(tooltip + " IV")) - return tooltip + " V"; + if (tag.equals(tooltip + " IV")) return tooltip + " V"; - if (tag.equals(tooltip + " V")) - return tooltip + " VI"; + if (tag.equals(tooltip + " V")) return tooltip + " VI"; - if (tag.equals(tooltip + " VI")) - return tooltip + " VII"; + if (tag.equals(tooltip + " VI")) return tooltip + " VII"; - if (tag.equals(tooltip + " VII")) - return tooltip + " VIII"; + if (tag.equals(tooltip + " VII")) return tooltip + " VIII"; - if (tag.equals(tooltip + " VIII")) - return tooltip + " IX"; + if (tag.equals(tooltip + " VIII")) return tooltip + " IX"; - if (tag.equals(tooltip + " IX")) - return tooltip + " X"; + if (tag.equals(tooltip + " IX")) return tooltip + " X"; return tooltip + " X+"; } - public boolean validType (IModifyable input) - { + public boolean validType(IModifyable input) { return input.getModifyType().equals("Tool"); } // Helper methods - public boolean areItemsEquivalent (ItemStack stack1, ItemStack stack2) - { - if (stack1.getItem() != stack2.getItem()) - return false; + public boolean areItemsEquivalent(ItemStack stack1, ItemStack stack2) { + if (stack1.getItem() != stack2.getItem()) return false; return ItemStack.areItemStackTagsEqual(stack1, stack2); } - public boolean areItemStacksEquivalent (ItemStack stack1, ItemStack stack2) - { - if (stack1.getItem() != stack2.getItem()) - return false; - if (stack1.getItemDamage() != stack2.getItemDamage()) - return false; + public boolean areItemStacksEquivalent(ItemStack stack1, ItemStack stack2) { + if (stack1.getItem() != stack2.getItem()) return false; + if (stack1.getItemDamage() != stack2.getItemDamage()) return false; return ItemStack.areItemStackTagsEqual(stack1, stack2); } - public static NBTTagCompound getAttributeTag (String attributeType, String modifierName, double amount, boolean flat, UUID uuid) - { + public static NBTTagCompound getAttributeTag( + String attributeType, String modifierName, double amount, boolean flat, UUID uuid) { NBTTagCompound tag = new NBTTagCompound(); tag.setString("AttributeName", attributeType); tag.setString("Name", modifierName); tag.setDouble("Amount", amount); - tag.setInteger("Operation", flat ? 0 : 1);//0 = flat increase, 1 = % increase + tag.setInteger("Operation", flat ? 0 : 1); // 0 = flat increase, 1 = % increase tag.setLong("UUIDMost", uuid.getMostSignificantBits()); tag.setLong("UUIDLeast", uuid.getLeastSignificantBits()); return tag; diff --git a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java index 36bdbba3e54..b2f463d179b 100644 --- a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java @@ -1,19 +1,11 @@ package tconstruct.library.tools; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.management.ItemInWorldManager; import net.minecraft.util.MovingObjectPosition; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - public abstract class AOEHarvestTool extends HarvestTool { public int breakRadius; public int breakDepth; @@ -28,21 +20,19 @@ public AOEHarvestTool(int baseDamage, int breakRadius, int breakDepth) { @Override public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { // only effective materials matter. We don't want to aoe when beraking dirt with a hammer. - Block block = player.worldObj.getBlock(x,y,z); - int meta = player.worldObj.getBlockMetadata(x,y,z); - if(block == null || !isEffective(block, meta) || !stack.hasTagCompound()) - return super.onBlockStartBreak(stack, x,y,z, player); + Block block = player.worldObj.getBlock(x, y, z); + int meta = player.worldObj.getBlockMetadata(x, y, z); + if (block == null || !isEffective(block, meta) || !stack.hasTagCompound()) + return super.onBlockStartBreak(stack, x, y, z, player); // tool broken? NBTTagCompound toolTags = stack.getTagCompound().getCompoundTag("InfiTool"); - if(toolTags == null || toolTags.getBoolean("Broken")) - return super.onBlockStartBreak(stack, x,y,z, player); + if (toolTags == null || toolTags.getBoolean("Broken")) return super.onBlockStartBreak(stack, x, y, z, player); MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(player.worldObj, player, false, 4.5d); - if(mop == null) - return super.onBlockStartBreak(stack, x,y,z, player); + if (mop == null) return super.onBlockStartBreak(stack, x, y, z, player); int sideHit = mop.sideHit; - //int sideHit = Minecraft.getMinecraft().objectMouseOver.sideHit; + // int sideHit = Minecraft.getMinecraft().objectMouseOver.sideHit; // we successfully destroyed a block. time to do AOE! int xRange = breakRadius; @@ -70,15 +60,12 @@ public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPla for (int yPos = y - yRange; yPos <= y + yRange; yPos++) for (int zPos = z - zRange; zPos <= z + zRange; zPos++) { // don't break the originally already broken block, duh - if (xPos == x && yPos == y && zPos == z) - continue; + if (xPos == x && yPos == y && zPos == z) continue; - if(!super.onBlockStartBreak(stack, xPos, yPos, zPos, player)) - breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player, x,y,z); + if (!super.onBlockStartBreak(stack, xPos, yPos, zPos, player)) + breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player, x, y, z); } - return super.onBlockStartBreak(stack, x, y, z, player); } - } diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 1dbed5e347c..d95a14f30dd 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -1,12 +1,11 @@ package tconstruct.library.tools; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.Event.Result; +import java.util.Iterator; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -34,16 +33,14 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.util.PiercingEntityDamage; -public class AbilityHelper -{ +public class AbilityHelper { public static Random random = new Random(); public static boolean necroticUHS; /* Normal interactions */ - public static boolean onBlockChanged (ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player, Random random) - { - if (!stack.hasTagCompound()) - return false; + public static boolean onBlockChanged( + ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player, Random random) { + if (!stack.hasTagCompound()) return false; int reinforced = 0; NBTTagCompound tags = stack.getTagCompound(); @@ -51,23 +48,20 @@ public static boolean onBlockChanged (ItemStack stack, World world, Block block, if (tags.getCompoundTag("InfiTool").hasKey("Unbreaking")) reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); - if (random.nextInt(10) < 10 - reinforced) - { + if (random.nextInt(10) < 10 - reinforced) { damageTool(stack, 1, tags, player, false); } return true; } - public static boolean onLeftClickEntity (ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool) - { + public static boolean onLeftClickEntity(ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool) { return onLeftClickEntity(stack, player, entity, tool, 0); } - public static boolean onLeftClickEntity (ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool, int baseDamage) - { - if (entity != null && player != null && entity.canAttackWithItem() && stack.hasTagCompound()) - { + public static boolean onLeftClickEntity( + ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool, int baseDamage) { + if (entity != null && player != null && entity.canAttackWithItem() && stack.hasTagCompound()) { if (!entity.hitByEntity(player)) // can't attack this entity { NBTTagCompound tags = stack.getTagCompound(); @@ -85,152 +79,139 @@ public static boolean onLeftClickEntity (ItemStack stack, EntityLivingBase playe float enchantDamage = 0; // magic extra damage - if (entity instanceof EntityLivingBase) - { + if (entity instanceof EntityLivingBase) { enchantDamage = EnchantmentHelper.getEnchantmentModifierLiving(player, (EntityLivingBase) entity); } - if (damage > 0 || enchantDamage > 0) - { - boolean criticalHit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null && entity instanceof EntityLivingBase; - - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - if (mod.doesCriticalHit(tool, tags, toolTags, stack, player, entity)) - criticalHit = true; + if (damage > 0 || enchantDamage > 0) { + boolean criticalHit = player.fallDistance > 0.0F + && !player.onGround + && !player.isOnLadder() + && !player.isInWater() + && !player.isPotionActive(Potion.blindness) + && player.ridingEntity == null + && entity instanceof EntityLivingBase; + + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + if (mod.doesCriticalHit(tool, tags, toolTags, stack, player, entity)) criticalHit = true; } - if (criticalHit) - { + if (criticalHit) { damage += random.nextInt(damage / 2 + 2); } damage += enchantDamage; - if (tool.getDamageModifier() != 1f) - { + if (tool.getDamageModifier() != 1f) { damage *= tool.getDamageModifier(); } - if (broken) - { - if (baseDamage > 0) - damage = baseDamage; - else - damage = 1; + if (broken) { + if (baseDamage > 0) damage = baseDamage; + else damage = 1; } boolean causedDamage = false; boolean isAlive = entity.isEntityAlive(); - if (tool.pierceArmor() && !broken) - { + if (tool.pierceArmor() && !broken) { if (player instanceof EntityPlayer) - causedDamage = entity.attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage); - else - causedDamage = entity.attackEntityFrom(causePiercingDamage(player), damage); - } - else - { + causedDamage = + entity.attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage); + else causedDamage = entity.attackEntityFrom(causePiercingDamage(player), damage); + } else { if (player instanceof EntityPlayer) - causedDamage = entity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) player), damage); - else - causedDamage = entity.attackEntityFrom(DamageSource.causeMobDamage(player), damage); + causedDamage = entity.attackEntityFrom( + DamageSource.causePlayerDamage((EntityPlayer) player), damage); + else causedDamage = entity.attackEntityFrom(DamageSource.causeMobDamage(player), damage); } - if (causedDamage) - { + if (causedDamage) { damageTool(stack, 1, tags, player, false); // damageTool(stack, 1, player, false); tool.onEntityDamaged(player.worldObj, player, entity); - if (!necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).getHealth() <= 0)) - { - if(isAlive) { + if (!necroticUHS + || (entity instanceof IMob + && entity instanceof EntityLivingBase + && ((EntityLivingBase) entity).getHealth() <= 0)) { + if (isAlive) { int drain = toolTags.getInteger("Necrotic") * 2; - if (drain > 0) - player.heal(random.nextInt(drain + 1)); + if (drain > 0) player.heal(random.nextInt(drain + 1)); } } - if (knockback > 0) - { - entity.addVelocity((double) (-MathHelper.sin(player.rotationYaw * (float) Math.PI / 180.0F) * (float) knockback * 0.5F), 0.1D, (double) (MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F) * (float) knockback * 0.5F)); + if (knockback > 0) { + entity.addVelocity( + (double) (-MathHelper.sin(player.rotationYaw * (float) Math.PI / 180.0F) + * (float) knockback + * 0.5F), + 0.1D, + (double) (MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F) + * (float) knockback + * 0.5F)); player.motionX *= 0.6D; player.motionZ *= 0.6D; player.setSprinting(false); } - if (player instanceof EntityPlayer) - { - if (criticalHit) - { + if (player instanceof EntityPlayer) { + if (criticalHit) { ((EntityPlayer) player).onCriticalHit(entity); } - if (enchantDamage > 0) - { + if (enchantDamage > 0) { ((EntityPlayer) player).onEnchantmentCritical(entity); } - if (damage >= 18) - { + if (damage >= 18) { ((EntityPlayer) player).triggerAchievement(AchievementList.overkill); } } player.setLastAttacker(entity); - if (entity instanceof EntityLivingBase) - { - DamageSource.causeThornsDamage(entity);// (((EntityLivingBase)player, - // (EntityLivingBase) - // entity); + if (entity instanceof EntityLivingBase) { + DamageSource.causeThornsDamage(entity); // (((EntityLivingBase)player, + // (EntityLivingBase) + // entity); } } - if (entity instanceof EntityLivingBase) - { - if (entity instanceof EntityPlayer) - { + if (entity instanceof EntityLivingBase) { + if (entity instanceof EntityPlayer) { stack.hitEntity((EntityLivingBase) entity, (EntityPlayer) player); - if (entity.isEntityAlive()) - { + if (entity.isEntityAlive()) { alertPlayerWolves((EntityPlayer) player, (EntityLivingBase) entity, true); } ((EntityPlayer) player).addStat(StatList.damageDealtStat, damage); - } - else - { + } else { stack.getItem().hitEntity(stack, (EntityLivingBase) entity, player); } - if(causedDamage) - processFiery(player, entity, toolTags); + if (causedDamage) processFiery(player, entity, toolTags); } - if (entity instanceof EntityPlayer) - ((EntityPlayer) player).addExhaustion(0.3F); - if (causedDamage) - return true; + if (entity instanceof EntityPlayer) ((EntityPlayer) player).addExhaustion(0.3F); + if (causedDamage) return true; } } } return false; } - public static int calcDamage(Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) - { - EntityLivingBase living = user instanceof EntityLivingBase ? (EntityLivingBase)user : null; + public static int calcDamage( + Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) { + EntityLivingBase living = user instanceof EntityLivingBase ? (EntityLivingBase) user : null; int damage = toolTags.getInteger("Attack") + baseDamage; int earlyModDamage = 0; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - earlyModDamage = mod.baseAttackDamage(earlyModDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + earlyModDamage = mod.baseAttackDamage( + earlyModDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); } damage += earlyModDamage; - if(living != null) { + if (living != null) { if (living.isPotionActive(Potion.damageBoost)) { damage += 3 << living.getActivePotionEffect(Potion.damageBoost).getAmplifier(); } @@ -241,108 +222,109 @@ public static int calcDamage(Entity user, Entity entity, ItemStack stack, ToolCo } damage -= calcStoneboundBonus(tool, toolTags); - if (damage < 1) - damage = 1; + if (damage < 1) damage = 1; - if (living != null && living.isSprinting()) - { + if (living != null && living.isSprinting()) { float lunge = tool.chargeAttack(); - if (lunge > 1f) - { + if (lunge > 1f) { damage *= lunge; } } int modDamage = 0; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - modDamage = mod.attackDamage(modDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + modDamage = + mod.attackDamage(modDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity); } damage += modDamage; return damage; } - public static float calcKnockback(Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) - { - if(user == null) return 0; + public static float calcKnockback( + Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) { + if (user == null) return 0; float knockback = 0; - if (entity instanceof EntityLivingBase && user instanceof EntityLivingBase) - { - knockback += EnchantmentHelper.getKnockbackModifier((EntityLivingBase)user, (EntityLivingBase) entity); + if (entity instanceof EntityLivingBase && user instanceof EntityLivingBase) { + knockback += EnchantmentHelper.getKnockbackModifier((EntityLivingBase) user, (EntityLivingBase) entity); } - if (user.isSprinting()) - { + if (user.isSprinting()) { knockback++; float lunge = tool.chargeAttack(); - if (lunge > 1f) - { + if (lunge > 1f) { knockback += lunge - 1.0f; } } float modKnockback = 0f; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - modKnockback = mod.knockback(modKnockback, knockback, tool, stack.getTagCompound(), toolTags, stack, user instanceof EntityLivingBase ? (EntityLivingBase)user : null, entity); + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + modKnockback = mod.knockback( + modKnockback, + knockback, + tool, + stack.getTagCompound(), + toolTags, + stack, + user instanceof EntityLivingBase ? (EntityLivingBase) user : null, + entity); } knockback += modKnockback; return knockback; } - public static void processFiery(Entity player, Entity target, NBTTagCompound toolTags) - { + public static void processFiery(Entity player, Entity target, NBTTagCompound toolTags) { // only living things burnnnn - if(!(target instanceof EntityLivingBase)) - return; + if (!(target instanceof EntityLivingBase)) return; int fireAspect = 0; - if(player instanceof EntityLivingBase) - fireAspect = EnchantmentHelper.getFireAspectModifier((EntityLivingBase)player); + if (player instanceof EntityLivingBase) + fireAspect = EnchantmentHelper.getFireAspectModifier((EntityLivingBase) player); - if ((fireAspect > 0 || toolTags.hasKey("Fiery") || toolTags.hasKey("Lava"))) - { + if ((fireAspect > 0 || toolTags.hasKey("Fiery") || toolTags.hasKey("Lava"))) { fireAspect *= 4; - if (toolTags.hasKey("Fiery")) - { + if (toolTags.hasKey("Fiery")) { fireAspect += toolTags.getInteger("Fiery") / 5 + 1; } - if (toolTags.getBoolean("Lava")) - { + if (toolTags.getBoolean("Lava")) { fireAspect += 3; } target.setFire(fireAspect); } } - static void alertPlayerWolves (EntityPlayer player, EntityLivingBase living, boolean par2) - { - if (!(living instanceof EntityCreeper) && !(living instanceof EntityGhast)) - { - if (living instanceof EntityWolf) - { + static void alertPlayerWolves(EntityPlayer player, EntityLivingBase living, boolean par2) { + if (!(living instanceof EntityCreeper) && !(living instanceof EntityGhast)) { + if (living instanceof EntityWolf) { EntityWolf var3 = (EntityWolf) living; - if (var3.isTamed() && player.getDisplayName().equals(var3.func_152113_b())) - { + if (var3.isTamed() && player.getDisplayName().equals(var3.func_152113_b())) { return; } } - if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living)) - { - List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, AxisAlignedBB.getBoundingBox(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); + if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living)) { + List var6 = player.worldObj.getEntitiesWithinAABB( + EntityWolf.class, + AxisAlignedBB.getBoundingBox( + player.posX, + player.posY, + player.posZ, + player.posX + 1.0D, + player.posY + 1.0D, + player.posZ + 1.0D) + .expand(16.0D, 4.0D, 16.0D)); Iterator var4 = var6.iterator(); - while (var4.hasNext()) - { + while (var4.hasNext()) { EntityWolf var5 = (EntityWolf) var4.next(); - if (var5.isTamed() && var5.getEntityToAttack() == null && player.getDisplayName().equals(var5.func_152113_b()) && (!par2 || !var5.isSitting())) - { + if (var5.isTamed() + && var5.getEntityToAttack() == null + && player.getDisplayName().equals(var5.func_152113_b()) + && (!par2 || !var5.isSitting())) { var5.setSitting(false); var5.setTarget(living); } @@ -352,87 +334,67 @@ static void alertPlayerWolves (EntityPlayer player, EntityLivingBase living, boo } /* Tool specific */ - public static void damageTool (ItemStack stack, int dam, EntityLivingBase entity, boolean ignoreCharge) - { + public static void damageTool(ItemStack stack, int dam, EntityLivingBase entity, boolean ignoreCharge) { NBTTagCompound tags = stack.getTagCompound(); damageTool(stack, dam, tags, entity, ignoreCharge); } - public static void healTool (ItemStack stack, int dam, EntityLivingBase entity, boolean ignoreCharge) - { + public static void healTool(ItemStack stack, int dam, EntityLivingBase entity, boolean ignoreCharge) { NBTTagCompound tags = stack.getTagCompound(); damageTool(stack, -dam, tags, entity, ignoreCharge); } - public static void damageTool (ItemStack stack, int dam, NBTTagCompound tags, EntityLivingBase entity, boolean ignoreCharge) - { + public static void damageTool( + ItemStack stack, int dam, NBTTagCompound tags, EntityLivingBase entity, boolean ignoreCharge) { if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode || tags == null) return; // calculate in reinforced/unbreaking int reinforced = 0; - if(tags.hasKey("InfiTool") && dam > 0) // unbreaking only affects damage, not healing + if (tags.hasKey("InfiTool") && dam > 0) // unbreaking only affects damage, not healing { NBTTagCompound toolTags = tags.getCompoundTag("InfiTool"); - if(toolTags.hasKey("Unbreaking")) - { + if (toolTags.hasKey("Unbreaking")) { reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); // for each point of damage we deal, we separately decide if reinforced takes effect - for(int i = dam; i > 0; i--) - if(random.nextInt(10) < reinforced) - dam--; + for (int i = dam; i > 0; i--) if (random.nextInt(10) < reinforced) dam--; // we prevented all damage with reinforced - if(dam <= 0) - return; + if (dam <= 0) return; } } - if (ignoreCharge || !damageEnergyTool(stack, tags, entity)) - { + if (ignoreCharge || !damageEnergyTool(stack, tags, entity)) { boolean damagedTool = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - if (mod.damageTool(stack, dam, entity)) - damagedTool = true; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + if (mod.damageTool(stack, dam, entity)) damagedTool = true; } - if (damagedTool) - return; + if (damagedTool) return; int damage = tags.getCompoundTag("InfiTool").getInteger("Damage"); int damageTrue = damage + dam; int maxDamage = tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); - if (damageTrue <= 0) - { + if (damageTrue <= 0) { tags.getCompoundTag("InfiTool").setInteger("Damage", 0); - //stack.setItemDamage(0); + // stack.setItemDamage(0); tags.getCompoundTag("InfiTool").setBoolean("Broken", false); - } - - else if (damageTrue > maxDamage) - { + } else if (damageTrue > maxDamage) { breakTool(stack, tags, entity); - //stack.setItemDamage(0); - } - - else - { + // stack.setItemDamage(0); + } else { tags.getCompoundTag("InfiTool").setInteger("Damage", damage + dam); int toolDamage = (damage * 100 / maxDamage) + 1; int stackDamage = stack.getItemDamage(); - if (toolDamage != stackDamage) - { - //stack.setItemDamage((damage * 100 / maxDamage) + 1); + if (toolDamage != stackDamage) { + // stack.setItemDamage((damage * 100 / maxDamage) + 1); } } } } - public static boolean damageEnergyTool (ItemStack stack, NBTTagCompound tags, Entity entity) - { - if (!tags.hasKey("Energy")) - return false; + public static boolean damageEnergyTool(ItemStack stack, NBTTagCompound tags, Entity entity) { + if (!tags.hasKey("Energy")) return false; NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); int energy = tags.getInteger("Energy"); @@ -441,20 +403,17 @@ public static boolean damageEnergyTool (ItemStack stack, NBTTagCompound tags, En float mineSpeed = toolTag.getInteger("MiningSpeed"); int heads = 1; - if (toolTag.hasKey("MiningSpeed2")) - { + if (toolTag.hasKey("MiningSpeed2")) { mineSpeed += toolTag.getInteger("MiningSpeed2"); heads++; } - if (toolTag.hasKey("MiningSpeedHandle")) - { + if (toolTag.hasKey("MiningSpeedHandle")) { mineSpeed += toolTag.getInteger("MiningSpeedHandle"); heads++; } - if (toolTag.hasKey("MiningSpeedExtra")) - { + if (toolTag.hasKey("MiningSpeedExtra")) { mineSpeed += toolTag.getInteger("MiningSpeedExtra"); heads++; } @@ -463,38 +422,33 @@ public static boolean damageEnergyTool (ItemStack stack, NBTTagCompound tags, En float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; trueSpeed += bonusLog; trueSpeed *= 6; - if (energy != -1) - { - int usage = (int)(trueSpeed * 2.8f); + if (energy != -1) { + int usage = (int) (trueSpeed * 2.8f); // first try charging from the hotbar if we don't have CoFHs override - if (!equalityOverrideLoaded && entity instanceof EntityPlayer) - { + if (!equalityOverrideLoaded && entity instanceof EntityPlayer) { ToolCore tool = (ToolCore) stack.getItem(); // workaround for charging flux-capacitors making tools unusable chargeEnergyFromHotbar(stack, (EntityPlayer) entity, tags); energy = tool.getEnergyStored(stack); } - if (energy < usage) - { - if (energy > 0) - tags.setInteger("Energy", 0); + if (energy < usage) { + if (energy > 0) tags.setInteger("Energy", 0); return false; } energy -= usage; tags.setInteger("Energy", energy); - //stack.setItemDamage(1 + (tool.getMaxEnergyStored(stack) - energy) * (stack.getMaxDamage() - 1) / tool.getMaxEnergyStored(stack)); + // stack.setItemDamage(1 + (tool.getMaxEnergyStored(stack) - energy) * (stack.getMaxDamage() - 1) / + // tool.getMaxEnergyStored(stack)); } return true; } - protected static void chargeEnergyFromHotbar (ItemStack stack, EntityPlayer player, NBTTagCompound tags) - { + protected static void chargeEnergyFromHotbar(ItemStack stack, EntityPlayer player, NBTTagCompound tags) { // cool kids only - if (!(stack.getItem() instanceof ToolCore)) - return; + if (!(stack.getItem() instanceof ToolCore)) return; ToolCore tool = (ToolCore) stack.getItem(); @@ -508,26 +462,21 @@ protected static void chargeEnergyFromHotbar (ItemStack stack, EntityPlayer play int missing = max - buffer; // you're full. xbox go home. - if (missing <= 0) - return; + if (missing <= 0) return; // iterate through hotbar - for (int iter = 0; iter < 9; ++iter) - { + for (int iter = 0; iter < 9; ++iter) { ItemStack slot = player.inventory.mainInventory[iter]; // check if item is not another tool - if (slot == null || slot.getItem() instanceof ToolCore) - continue; + if (slot == null || slot.getItem() instanceof ToolCore) continue; // check if item gives energy - if (!(slot.getItem() instanceof IEnergyContainerItem)) - continue; + if (!(slot.getItem() instanceof IEnergyContainerItem)) continue; IEnergyContainerItem fluxItem = (IEnergyContainerItem) slot.getItem(); // mDiyo EATS your power - while (fluxItem.extractEnergy(slot, missing, true) > 0) - { + while (fluxItem.extractEnergy(slot, missing, true) > 0) { missing -= fluxItem.extractEnergy(slot, missing, false); } } @@ -535,172 +484,158 @@ protected static void chargeEnergyFromHotbar (ItemStack stack, EntityPlayer play tags.setInteger("Energy", max - missing); } - private static boolean equalityOverrideLoaded = Loader.isModLoaded("CoFHCore"); // Mods should be loaded far enough before this is ever initialized + private static boolean equalityOverrideLoaded = + Loader.isModLoaded("CoFHCore"); // Mods should be loaded far enough before this is ever initialized - public static void breakTool (ItemStack stack, NBTTagCompound tags, Entity entity) - { + public static void breakTool(ItemStack stack, NBTTagCompound tags, Entity entity) { tags.getCompoundTag("InfiTool").setBoolean("Broken", true); if (entity != null) entity.worldObj.playSound(entity.posX, entity.posY, entity.posZ, "random.break", 1f, 1f, true); } - public static void repairTool (ItemStack stack, NBTTagCompound tags) - { + public static void repairTool(ItemStack stack, NBTTagCompound tags) { tags.getCompoundTag("InfiTool").setBoolean("Broken", false); tags.getCompoundTag("InfiTool").setInteger("Damage", 0); } - public static DamageSource causePiercingDamage (EntityLivingBase mob) - { + public static DamageSource causePiercingDamage(EntityLivingBase mob) { return new PiercingEntityDamage("mob", mob); } - public static DamageSource causePlayerPiercingDamage (EntityPlayer player) - { + public static DamageSource causePlayerPiercingDamage(EntityPlayer player) { return new PiercingEntityDamage("player", player); } - public static void knockbackEntity (EntityLivingBase living, double boost) - { + public static void knockbackEntity(EntityLivingBase living, double boost) { living.motionX *= boost; // living.motionY *= boost/2; living.motionZ *= boost; } - public static boolean hoeGround (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, Random random) - { - if (!player.canPlayerEdit(x, y, z, side, stack)) - { + public static boolean hoeGround( + ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, Random random) { + if (!player.canPlayerEdit(x, y, z, side, stack)) { return false; - } - else - { + } else { UseHoeEvent event = new UseHoeEvent(player, stack, world, x, y, z); - if (MinecraftForge.EVENT_BUS.post(event)) - { + if (MinecraftForge.EVENT_BUS.post(event)) { return false; } - if (event.getResult() == Result.ALLOW) - { + if (event.getResult() == Result.ALLOW) { damageTool(stack, 1, player, false); return true; } Block block = world.getBlock(x, y, z); - if (side != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) - { + if (side != 0 + && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) + && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); - - if (world.isRemote) - { + world.playSoundEffect( + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + block1.stepSound.getStepResourcePath(), + (block1.stepSound.getVolume() + 1.0F) / 2.0F, + block1.stepSound.getPitch() * 0.8F); + + if (world.isRemote) { return true; - } - else - { + } else { world.setBlock(x, y, z, block1); damageTool(stack, 1, player, false); return true; } - } - else - { + } else { return false; } } } - public static void spawnItemAtEntity (Entity entity, ItemStack stack, int delay) - { - if (!entity.worldObj.isRemote) - { - EntityItem entityitem = new EntityItem(entity.worldObj, entity.posX + 0.5D, entity.posY + 0.5D, entity.posZ + 0.5D, stack); + public static void spawnItemAtEntity(Entity entity, ItemStack stack, int delay) { + if (!entity.worldObj.isRemote) { + EntityItem entityitem = + new EntityItem(entity.worldObj, entity.posX + 0.5D, entity.posY + 0.5D, entity.posZ + 0.5D, stack); entityitem.delayBeforeCanPickup = delay; entity.worldObj.spawnEntityInWorld(entityitem); } } - public static void spawnItemAtPlayer (EntityPlayer player, ItemStack stack) - { - if (!player.worldObj.isRemote) - { + public static void spawnItemAtPlayer(EntityPlayer player, ItemStack stack) { + if (!player.worldObj.isRemote) { // try to put it into the players inventory - if(player instanceof FakePlayer || !player.inventory.addItemStackToInventory(stack)) // note that the addItemStackToInventory is not called for fake players + if (player instanceof FakePlayer + || !player.inventory.addItemStackToInventory( + stack)) // note that the addItemStackToInventory is not called for fake players { // drop the rest as an entity - EntityItem entityitem = new EntityItem(player.worldObj, player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, stack); + EntityItem entityitem = new EntityItem( + player.worldObj, player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, stack); player.worldObj.spawnEntityInWorld(entityitem); - if (!(player instanceof FakePlayer)) - entityitem.onCollideWithPlayer(player); + if (!(player instanceof FakePlayer)) entityitem.onCollideWithPlayer(player); } // if it got picked up, we're playing the sound else { - if(player instanceof EntityPlayerMP) { - player.worldObj.playSoundAtEntity(player, "random.pop", 0.2F, ((TConstruct.random.nextFloat() - TConstruct.random.nextFloat()) * 0.7F + 1.0F) * 2.0F); + if (player instanceof EntityPlayerMP) { + player.worldObj.playSoundAtEntity( + player, + "random.pop", + 0.2F, + ((TConstruct.random.nextFloat() - TConstruct.random.nextFloat()) * 0.7F + 1.0F) * 2.0F); player.inventoryContainer.detectAndSendChanges(); } } } - } /* Ranged weapons */ - public static void forceAddToInv (EntityPlayer entityplayer, ItemStack itemstack, int i, boolean flag) - { + public static void forceAddToInv(EntityPlayer entityplayer, ItemStack itemstack, int i, boolean flag) { ItemStack itemstack1 = entityplayer.inventory.getStackInSlot(i); entityplayer.inventory.setInventorySlotContents(i, itemstack); - if (itemstack1 != null) - { + if (itemstack1 != null) { addToInv(entityplayer, itemstack1, flag); } } - public static boolean addToInv (EntityPlayer entityplayer, ItemStack itemstack, boolean flag) - { + public static boolean addToInv(EntityPlayer entityplayer, ItemStack itemstack, boolean flag) { return addToInv(entityplayer, itemstack, entityplayer.inventory.currentItem, flag); } - public static boolean addToInv (EntityPlayer entityplayer, ItemStack itemstack, int i, boolean flag) - { + public static boolean addToInv(EntityPlayer entityplayer, ItemStack itemstack, int i, boolean flag) { ItemStack itemstack1 = entityplayer.inventory.getStackInSlot(i); boolean flag1; - if (itemstack1 == null) - { + if (itemstack1 == null) { entityplayer.inventory.setInventorySlotContents(i, itemstack); flag1 = true; - } - else - { + } else { flag1 = entityplayer.inventory.addItemStackToInventory(itemstack); } - if (flag && !flag1) - { - addItemStackToWorld(entityplayer.worldObj, (float) Math.floor(entityplayer.posX), (float) Math.floor(entityplayer.posY), (float) Math.floor(entityplayer.posZ), itemstack); + if (flag && !flag1) { + addItemStackToWorld( + entityplayer.worldObj, + (float) Math.floor(entityplayer.posX), + (float) Math.floor(entityplayer.posY), + (float) Math.floor(entityplayer.posZ), + itemstack); return true; - } - else - { + } else { return flag1; } } - public static EntityItem addItemStackToWorld (World world, float f, float f1, float f2, ItemStack itemstack) - { + public static EntityItem addItemStackToWorld(World world, float f, float f1, float f2, ItemStack itemstack) { return addItemStackToWorld(world, f, f1, f2, itemstack, false); } - public static EntityItem addItemStackToWorld (World world, float f, float f1, float f2, ItemStack itemstack, boolean flag) - { + public static EntityItem addItemStackToWorld( + World world, float f, float f1, float f2, ItemStack itemstack, boolean flag) { EntityItem entityitem; - if (flag) - { + if (flag) { entityitem = new EntityItem(world, f, f1, f2, itemstack); - } - else - { + } else { float f3 = 0.7F; float f4 = random.nextFloat() * f3 + (1.0F - f3) * 0.5F; float f5 = 1.2F; @@ -712,15 +647,13 @@ public static EntityItem addItemStackToWorld (World world, float f, float f1, fl return entityitem; } - public static MovingObjectPosition raytraceFromEntity (World world, Entity player, boolean par3, double range) - { + public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) { float f = 1.0F; float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f; - if (!world.isRemote && player instanceof EntityPlayer) - d1 += 1.62D; + if (!world.isRemote && player instanceof EntityPlayer) d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); @@ -730,38 +663,32 @@ public static MovingObjectPosition raytraceFromEntity (World world, Entity playe float f7 = f4 * f5; float f8 = f3 * f5; double d3 = range; - if (player instanceof EntityPlayerMP) - { + if (player instanceof EntityPlayerMP) { d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance(); } Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3); return world.func_147447_a(vec3, vec31, par3, !par3, par3); } - public static float calcToolSpeed (ToolCore tool, NBTTagCompound tags) - { + public static float calcToolSpeed(ToolCore tool, NBTTagCompound tags) { float mineSpeed = tags.getInteger("MiningSpeed"); int heads = 1; - if (tags.hasKey("MiningSpeed2")) - { + if (tags.hasKey("MiningSpeed2")) { mineSpeed += tags.getInteger("MiningSpeed2"); heads++; } - if (tags.hasKey("MiningSpeedHandle")) - { + if (tags.hasKey("MiningSpeedHandle")) { mineSpeed += tags.getInteger("MiningSpeedHandle"); heads++; } - if (tags.hasKey("MiningSpeedExtra")) - { + if (tags.hasKey("MiningSpeedExtra")) { mineSpeed += tags.getInteger("MiningSpeedExtra"); heads++; } float speedMod = 1f; - if (tool instanceof HarvestTool) - speedMod = ((HarvestTool) tool).breakSpeedModifier(); + if (tool instanceof HarvestTool) speedMod = ((HarvestTool) tool).breakSpeedModifier(); float trueSpeed = mineSpeed / (heads * 100f) * speedMod; trueSpeed += calcStoneboundBonus(tool, tags); @@ -769,15 +696,13 @@ public static float calcToolSpeed (ToolCore tool, NBTTagCompound tags) return trueSpeed; } - public static float calcDualToolSpeed (ToolCore tool, NBTTagCompound tags, boolean secondary) - { + public static float calcDualToolSpeed(ToolCore tool, NBTTagCompound tags, boolean secondary) { String tag = "MiningSpeed"; - if(secondary) tag += "2"; + if (secondary) tag += "2"; float mineSpeed = tags.getInteger(tag); float speedMod = 1f; - if (tool instanceof HarvestTool) - speedMod = ((HarvestTool) tool).breakSpeedModifier(); + if (tool instanceof HarvestTool) speedMod = ((HarvestTool) tool).breakSpeedModifier(); float trueSpeed = mineSpeed / 100f * speedMod; trueSpeed += calcStoneboundBonus(tool, tags); @@ -785,13 +710,11 @@ public static float calcDualToolSpeed (ToolCore tool, NBTTagCompound tags, boole return trueSpeed; } - public static float calcStoneboundBonus (ToolCore tool, NBTTagCompound tags) - { + public static float calcStoneboundBonus(ToolCore tool, NBTTagCompound tags) { int durability = tags.getInteger("Damage"); float stonebound = tags.getFloat("Shoddy"); float stoneboundMod = 72f; - if (tool instanceof HarvestTool) - stoneboundMod = ((HarvestTool) tool).stoneboundModifier(); + if (tool instanceof HarvestTool) stoneboundMod = ((HarvestTool) tool).stoneboundModifier(); return (float) Math.log(durability / stoneboundMod + 1) * 2 * stonebound; } diff --git a/src/main/java/tconstruct/library/tools/ArrowMaterial.java b/src/main/java/tconstruct/library/tools/ArrowMaterial.java index 4f705b6d63b..b048241bed0 100644 --- a/src/main/java/tconstruct/library/tools/ArrowMaterial.java +++ b/src/main/java/tconstruct/library/tools/ArrowMaterial.java @@ -1,19 +1,16 @@ package tconstruct.library.tools; -public class ArrowMaterial -{ +public class ArrowMaterial { public final float mass; public final float breakChance; - public ArrowMaterial(float weight, float breakChance) - { + public ArrowMaterial(float weight, float breakChance) { this.mass = weight; this.breakChance = breakChance; } @Deprecated - public ArrowMaterial(float weight, float breakChance, float accuraccy) - { + public ArrowMaterial(float weight, float breakChance, float accuraccy) { this(weight, breakChance); } diff --git a/src/main/java/tconstruct/library/tools/BowMaterial.java b/src/main/java/tconstruct/library/tools/BowMaterial.java index 628dba52c4b..25a1a93b679 100644 --- a/src/main/java/tconstruct/library/tools/BowMaterial.java +++ b/src/main/java/tconstruct/library/tools/BowMaterial.java @@ -1,19 +1,16 @@ package tconstruct.library.tools; -public class BowMaterial -{ +public class BowMaterial { public final int drawspeed; public final float flightSpeedMax; - public BowMaterial(int drawspeed, float attack) - { + public BowMaterial(int drawspeed, float attack) { this.drawspeed = drawspeed; this.flightSpeedMax = attack; } @Deprecated - public BowMaterial(int durability, int drawspeed, float attack) - { + public BowMaterial(int durability, int drawspeed, float attack) { this(drawspeed, attack); } diff --git a/src/main/java/tconstruct/library/tools/BowstringMaterial.java b/src/main/java/tconstruct/library/tools/BowstringMaterial.java index 5a7b1549f06..acc27aa184e 100644 --- a/src/main/java/tconstruct/library/tools/BowstringMaterial.java +++ b/src/main/java/tconstruct/library/tools/BowstringMaterial.java @@ -2,14 +2,20 @@ import net.minecraft.item.ItemStack; -public class BowstringMaterial extends CustomMaterial -{ +public class BowstringMaterial extends CustomMaterial { public final float durabilityModifier; public final float drawspeedModifier; public final float flightSpeedModifier; - public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed, int color) - { + public BowstringMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingItem, + float durability, + float drawspeed, + float flightspeed, + int color) { super(materialID, value, input, craftingItem, color); this.durabilityModifier = durability; this.drawspeedModifier = drawspeed; @@ -17,8 +23,14 @@ public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack c } @Deprecated - public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed) - { + public BowstringMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingItem, + float durability, + float drawspeed, + float flightspeed) { super(materialID, value, input, craftingItem); this.durabilityModifier = durability; this.drawspeedModifier = drawspeed; diff --git a/src/main/java/tconstruct/library/tools/CustomMaterial.java b/src/main/java/tconstruct/library/tools/CustomMaterial.java index 4552b0d5b05..8d2cbfc5ad9 100644 --- a/src/main/java/tconstruct/library/tools/CustomMaterial.java +++ b/src/main/java/tconstruct/library/tools/CustomMaterial.java @@ -4,8 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -public abstract class CustomMaterial -{ +public abstract class CustomMaterial { public final int materialID; public final int value; public final ItemStack input; @@ -14,14 +13,11 @@ public abstract class CustomMaterial public final int color; @Deprecated - public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem) - { + public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem) { this(materialID, value, input, craftingItem, 0xffffffff); } - - public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, int color) - { + public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, int color) { this.materialID = materialID; this.value = value; this.input = input; @@ -31,13 +27,11 @@ public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craf } @Deprecated - public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem) - { + public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem) { this(materialID, value, oredict, craftingItem, 0xffffffff); } - public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem, int color) - { + public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem, int color) { this.materialID = materialID; this.value = value; this.input = null; @@ -49,17 +43,12 @@ public CustomMaterial(int materialID, int value, String oredict, ItemStack craft /** * Wether an itemstack is a stack of this custom material or not. */ - public boolean matches (ItemStack stack) - { - if (this.oredict != null) - { + public boolean matches(ItemStack stack) { + if (this.oredict != null) { List items = OreDictionary.getOres(oredict); - for (ItemStack item : items) - if (OreDictionary.itemMatches(item, stack, false)) - return true; + for (ItemStack item : items) if (OreDictionary.itemMatches(item, stack, false)) return true; return false; } return stack.isItemEqual(input); } - } diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 8da545266db..128b1b8a338 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -1,71 +1,53 @@ package tconstruct.library.tools; -import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import tconstruct.library.*; /* Base class for harvest tools with each head having a different purpose */ -public abstract class DualHarvestTool extends HarvestTool -{ - public DualHarvestTool(int baseDamage) - { +public abstract class DualHarvestTool extends HarvestTool { + public DualHarvestTool(int baseDamage) { super(baseDamage); } @Override public int getHarvestLevel(ItemStack stack, String toolClass) { // well, we can only get the harvestlevel if we have an item to get it from! - if(stack == null || !(stack.getItem() instanceof HarvestTool)) - return -1; + if (stack == null || !(stack.getItem() instanceof HarvestTool)) return -1; // invalid query or wrong toolclass - if(toolClass == null) - return -1; + if (toolClass == null) return -1; - if(!stack.hasTagCompound()) - return -1; + if (!stack.hasTagCompound()) return -1; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); // broken tools suck. - if (tags.getBoolean("Broken")) - return -1; + if (tags.getBoolean("Broken")) return -1; - if(this.getHarvestType().equals(toolClass)) - return tags.getInteger("HarvestLevel"); - else if(this.getSecondHarvestType().equals(toolClass)) - return tags.getInteger("HarvestLevel2"); + if (this.getHarvestType().equals(toolClass)) return tags.getInteger("HarvestLevel"); + else if (this.getSecondHarvestType().equals(toolClass)) return tags.getInteger("HarvestLevel2"); return -1; } @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) - { + public float getDigSpeed(ItemStack stack, Block block, int meta) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return 0.1f; + if (tags.getBoolean("Broken")) return 0.1f; Material[] materials = getEffectiveMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.getMaterial()) - { + for (int i = 0; i < materials.length; i++) { + if (materials[i] == block.getMaterial()) { if (block.getHarvestLevel(meta) <= tags.getInteger("HarvestLevel")) return AbilityHelper.calcDualToolSpeed(this, tags, false); return 0.1f; } } materials = getEffectiveSecondaryMaterials(); - for (int i = 0; i < materials.length; i++) - { - if (materials[i] == block.getMaterial()) - { + for (int i = 0; i < materials.length; i++) { + if (materials[i] == block.getMaterial()) { if (block.getHarvestLevel(meta) <= tags.getInteger("HarvestLevel2")) return AbilityHelper.calcDualToolSpeed(this, tags, true); return 0.1f; @@ -75,25 +57,20 @@ public float getDigSpeed (ItemStack stack, Block block, int meta) } @Override - public boolean isEffective (Material material) - { - if (super.isEffective(material)) - return true; + public boolean isEffective(Material material) { + if (super.isEffective(material)) return true; - for (Material m : getEffectiveSecondaryMaterials()) - if (m == material) - return true; + for (Material m : getEffectiveSecondaryMaterials()) if (m == material) return true; return false; } @Override - public String[] getTraits () - { - return new String[] { "harvest", "dualharvest" }; + public String[] getTraits() { + return new String[] {"harvest", "dualharvest"}; } - protected abstract Material[] getEffectiveSecondaryMaterials (); + protected abstract Material[] getEffectiveSecondaryMaterials(); - protected abstract String getSecondHarvestType (); + protected abstract String getSecondHarvestType(); } diff --git a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java index 4ca43ac67d6..04983c3bdad 100644 --- a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java +++ b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java @@ -2,6 +2,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -9,14 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.DynamicToolPart; import tconstruct.library.util.TextureHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -import java.util.List; -import java.util.Map; - public class DualMaterialToolPart extends DynamicToolPart { public IIcon defaultIcon2; public IIcon[] icons2; @@ -25,8 +23,7 @@ public DualMaterialToolPart(String textureType, String name) { super(textureType, name); } - public static ItemStack createDualMaterial(Item item, int mat1, int mat2) - { + public static ItemStack createDualMaterial(Item item, int mat1, int mat2) { ItemStack stack = new ItemStack(item, 1, mat1); NBTTagCompound tags = new NBTTagCompound(); NBTTagCompound subtag = new NBTTagCompound(); @@ -38,24 +35,20 @@ public static ItemStack createDualMaterial(Item item, int mat1, int mat2) return stack; } - public int getMaterialID2(ItemStack stack) - { - if(!stack.hasTagCompound()) - return -1; + public int getMaterialID2(ItemStack stack) { + if (!stack.hasTagCompound()) return -1; int id = stack.getTagCompound().getCompoundTag("DualMat").getInteger("Material2"); - if (TConstructRegistry.toolMaterials.keySet().contains(id)) - return id; + if (TConstructRegistry.toolMaterials.keySet().contains(id)) return id; return -1; } @Override - public void getSubItems (Item item, CreativeTabs tab, List list) - { + public void getSubItems(Item item, CreativeTabs tab, List list) { // material id == metadata - for(Integer matID : TConstructRegistry.toolMaterials.keySet()) + for (Integer matID : TConstructRegistry.toolMaterials.keySet()) list.add(createDualMaterial(item, matID, TinkerTools.MaterialID.Iron)); } @@ -78,12 +71,12 @@ public void registerIcons(IIconRegister iconRegister) { this.icons2 = new IIcon[icons.length]; // register icon for each material that has one - if(!PHConstruct.minimalTextures) - for(Map.Entry entry : TConstructRegistry.toolMaterials.entrySet()) - { - String tex = modTexPrefix + ":" + folder + entry.getValue().materialName.toLowerCase() + texture + "_2"; - if(TextureHelper.itemTextureExists(tex)) - this.icons2[entry.getKey()] = iconRegister.registerIcon(tex); + if (!PHConstruct.minimalTextures) + for (Map.Entry entry : + TConstructRegistry.toolMaterials.entrySet()) { + String tex = modTexPrefix + ":" + folder + + entry.getValue().materialName.toLowerCase() + texture + "_2"; + if (TextureHelper.itemTextureExists(tex)) this.icons2[entry.getKey()] = iconRegister.registerIcon(tex); } this.defaultIcon2 = iconRegister.registerIcon(modTexPrefix + ":" + folder + texture + "_2"); @@ -92,12 +85,10 @@ public void registerIcons(IIconRegister iconRegister) { @Override public IIcon getIconFromDamageForRenderPass(int meta, int pass) { // secondary item - if(pass > 0) { - if(meta > icons.length) - return defaultIcon2; + if (pass > 0) { + if (meta > icons.length) return defaultIcon2; - if(icons2[meta] == null) - return defaultIcon2; + if (icons2[meta] == null) return defaultIcon2; return icons2[meta]; } @@ -106,13 +97,11 @@ public IIcon getIconFromDamageForRenderPass(int meta, int pass) { @Override public int getColorFromItemStack(ItemStack stack, int renderpass) { - if(renderpass > 0) - { + if (renderpass > 0) { int matId = getMaterialID2(stack); - if(matId > icons2.length || matId < 0) - return super.getColorFromItemStack(stack, renderpass); + if (matId > icons2.length || matId < 0) return super.getColorFromItemStack(stack, renderpass); - if(icons[matId] == null) + if (icons[matId] == null) return TConstructRegistry.getMaterial(matId).primaryColor(); return super.getColorFromItemStack(stack, renderpass); diff --git a/src/main/java/tconstruct/library/tools/DynamicToolPart.java b/src/main/java/tconstruct/library/tools/DynamicToolPart.java index b2939dbe384..1dba39f1f67 100644 --- a/src/main/java/tconstruct/library/tools/DynamicToolPart.java +++ b/src/main/java/tconstruct/library/tools/DynamicToolPart.java @@ -2,28 +2,22 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Locale; +import java.util.Map; import mantle.items.abstracts.CraftingItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; -import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.library.util.TextureHelper; -import tconstruct.library.tools.CustomMaterial; -import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -public class DynamicToolPart extends CraftingItem implements IToolPart -{ +public class DynamicToolPart extends CraftingItem implements IToolPart { public String partName; public String texture; public IIcon defaultIcon; @@ -31,23 +25,20 @@ public class DynamicToolPart extends CraftingItem implements IToolPart private boolean hidden = false; - public DynamicToolPart(String texture, String name) - { + public DynamicToolPart(String texture, String name) { this(texture, name, (Class) null); } - public DynamicToolPart(String texture, String name, Class customMaterialClass) - { + public DynamicToolPart(String texture, String name, Class customMaterialClass) { this(texture, name, "tinker", customMaterialClass); } - public DynamicToolPart(String texture, String name, String domain) - { + public DynamicToolPart(String texture, String name, String domain) { this(texture, name, domain, (Class) null); } - public DynamicToolPart(String texture, String name, String domain, Class customMaterialClass) - { + public DynamicToolPart( + String texture, String name, String domain, Class customMaterialClass) { super(null, null, "parts/", domain, TConstructRegistry.partTab); this.setUnlocalizedName("tconstruct." + name); this.partName = name; @@ -58,8 +49,7 @@ public DynamicToolPart(String texture, String name, String domain, Class= 0) - material = material.substring(firstPeriodIndex+1); + if (firstPeriodIndex >= 0) material = material.substring(firstPeriodIndex + 1); matName = customMaterial.input.getDisplayName(); - } - else - { + } else { material = customMaterial.oredict; matName = customMaterial.oredict; } } // custom name - if (StatCollector.canTranslate("toolpart." + partName + "." + material)) - { + if (StatCollector.canTranslate("toolpart." + partName + "." + material)) { return StatCollector.translateToLocal("toolpart." + partName + "." + material); } // general name - else - { + else { // specific material name for materials? - if(StatCollector.canTranslate("toolpart.material." + material)) + if (StatCollector.canTranslate("toolpart.material." + material)) matName = StatCollector.translateToLocal("toolpart.material." + material); return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", matName); @@ -130,57 +109,49 @@ public String getItemStackDisplayName (ItemStack stack) @Override public String getUnlocalizedName(ItemStack stack) { int id = getMaterialID(stack); - if(id == -1) - return getUnlocalizedName(); + if (id == -1) return getUnlocalizedName(); String material = "unknown"; - if (customMaterialClass == null) - { + if (customMaterialClass == null) { tconstruct.library.tools.ToolMaterial toolmat = TConstructRegistry.getMaterial(getMaterialID(stack)); material = toolmat.materialName; - } - else - { - CustomMaterial customMaterial = TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass); - material = customMaterial.input != null ? customMaterial.input.getUnlocalizedName() : customMaterial.oredict; + } else { + CustomMaterial customMaterial = + TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass); + material = + customMaterial.input != null ? customMaterial.input.getUnlocalizedName() : customMaterial.oredict; } return "toolpart." + partName + "." + material; } @Override - public void getSubItems (Item item, CreativeTabs tab, List list) - { - if(hidden) - return; + public void getSubItems(Item item, CreativeTabs tab, List list) { + if (hidden) return; // material id == metadata - for(Integer matID : TConstructRegistry.defaultToolPartMaterials) { + for (Integer matID : TConstructRegistry.defaultToolPartMaterials) { ItemStack stack = new ItemStack(item, 1, matID); - if (this.getMaterialID(stack) != -1) - list.add(stack); + if (this.getMaterialID(stack) != -1) list.add(stack); } } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { // get the biggest material index int max = -1; - for(Integer id : TConstructRegistry.toolMaterials.keySet()) - if(id > max) - max = id; + for (Integer id : TConstructRegistry.toolMaterials.keySet()) if (id > max) max = id; - this.icons = new IIcon[max+1]; + this.icons = new IIcon[max + 1]; // register icon for each material that has one - if(!PHConstruct.minimalTextures) - for(Map.Entry entry : TConstructRegistry.toolMaterials.entrySet()) - { - String tex = modTexPrefix + ":" + folder + entry.getValue().materialName.toLowerCase() + texture; - if(TextureHelper.itemTextureExists(tex)) - this.icons[entry.getKey()] = iconRegister.registerIcon(tex); + if (!PHConstruct.minimalTextures) + for (Map.Entry entry : + TConstructRegistry.toolMaterials.entrySet()) { + String tex = modTexPrefix + ":" + folder + + entry.getValue().materialName.toLowerCase() + texture; + if (TextureHelper.itemTextureExists(tex)) this.icons[entry.getKey()] = iconRegister.registerIcon(tex); } // default texture @@ -188,13 +159,10 @@ public void registerIcons (IIconRegister iconRegister) } @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) - { - if(meta > icons.length) - return defaultIcon; + public IIcon getIconFromDamage(int meta) { + if (meta > icons.length) return defaultIcon; - if(icons[meta] == null) - return defaultIcon; + if (icons[meta] == null) return defaultIcon; return icons[meta]; } @@ -202,15 +170,12 @@ public IIcon getIconFromDamage (int meta) @Override public int getColorFromItemStack(ItemStack stack, int renderpass) { int matId = getMaterialID(stack); - if(matId > icons.length) - return super.getColorFromItemStack(stack, renderpass); + if (matId > icons.length) return super.getColorFromItemStack(stack, renderpass); - if(matId >= 0 && icons[matId] == null) - { + if (matId >= 0 && icons[matId] == null) { if (customMaterialClass == null) return TConstructRegistry.getMaterial(getMaterialID(stack)).primaryColor(); - else - return TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass).color; + else return TConstructRegistry.getCustomMaterial(getMaterialID(stack), customMaterialClass).color; } return super.getColorFromItemStack(stack, renderpass); diff --git a/src/main/java/tconstruct/library/tools/FletchingMaterial.java b/src/main/java/tconstruct/library/tools/FletchingMaterial.java index 9cb5b766c33..febf47ea86b 100644 --- a/src/main/java/tconstruct/library/tools/FletchingMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchingMaterial.java @@ -2,14 +2,20 @@ import net.minecraft.item.ItemStack; -public class FletchingMaterial extends CustomMaterial -{ +public class FletchingMaterial extends CustomMaterial { public final float accuracy; public final float breakChance; public final float durabilityModifier; - public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, float breakChance, float duribalityModifier, int color) - { + public FletchingMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingItem, + float accuracy, + float breakChance, + float duribalityModifier, + int color) { super(materialID, value, input, craftingItem, color); this.accuracy = accuracy; this.breakChance = breakChance; @@ -17,13 +23,26 @@ public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack c } @Deprecated - public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, float breakChance, float mass) - { + public FletchingMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingItem, + float accuracy, + float breakChance, + float mass) { this(materialID, value, input, craftingItem, accuracy, 0.01f, 1f, 0xffffffff); } - public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float duribalityModifier, int color) - { + public FletchingMaterial( + int materialID, + int value, + String oredict, + ItemStack craftingItem, + float accuracy, + float breakChance, + float duribalityModifier, + int color) { super(materialID, value, oredict, craftingItem, color); this.accuracy = accuracy; this.breakChance = breakChance; @@ -31,8 +50,14 @@ public FletchingMaterial(int materialID, int value, String oredict, ItemStack cr } @Deprecated - public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass) - { + public FletchingMaterial( + int materialID, + int value, + String oredict, + ItemStack craftingItem, + float accuracy, + float breakChance, + float mass) { this(materialID, value, oredict, craftingItem, accuracy, 0.01f, 1f, 0xffffffff); } diff --git a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java index d9546cc7af3..5b592560e14 100644 --- a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java @@ -4,31 +4,30 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -public class FletchlingLeafMaterial extends FletchingMaterial -{ - public FletchlingLeafMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float durabilityModifier) - { +public class FletchlingLeafMaterial extends FletchingMaterial { + public FletchlingLeafMaterial( + int materialID, + int value, + String oredict, + ItemStack craftingItem, + float accuracy, + float breakChance, + float durabilityModifier) { super(materialID, value, oredict, craftingItem, accuracy, breakChance, durabilityModifier, 0x5ece46); } @Override - public boolean matches (ItemStack stack) - { - if (matchesLeaves(stack)) - return true; + public boolean matches(ItemStack stack) { + if (matchesLeaves(stack)) return true; return super.matches(stack); } - public static boolean matchesLeaves (ItemStack stack) - { - if (stack != null) - { + public static boolean matchesLeaves(ItemStack stack) { + if (stack != null) { Block block = BlockUtils.getBlockFromItemStack(stack); - if (block != null) - { - if (block.isLeaves(null, 0, 0, 0)) - return true; + if (block != null) { + if (block.isLeaves(null, 0, 0, 0)) return true; } } return false; diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 3e4df3eedea..2181157db97 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -1,177 +1,150 @@ package tconstruct.library.tools; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.HashSet; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLogic; import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; import net.minecraft.network.play.client.C07PacketPlayerDigging; import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraft.world.WorldSettings; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.world.BlockEvent; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -import java.util.HashSet; -import java.util.Set; - /* Base class for tools that should be harvesting blocks */ -public abstract class HarvestTool extends ToolCore -{ - public HarvestTool(int baseDamage) - { +public abstract class HarvestTool extends ToolCore { + public HarvestTool(int baseDamage) { super(baseDamage); } @Override - public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) - { + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { return super.onBlockStartBreak(stack, x, y, z, player); } @Override public int getHarvestLevel(ItemStack stack, String toolClass) { // well, we can only get the harvestlevel if we have an item to get it from! - if(stack == null || !(stack.getItem() instanceof HarvestTool)) - return -1; + if (stack == null || !(stack.getItem() instanceof HarvestTool)) return -1; // invalid query or wrong toolclass - if(toolClass == null || !this.getHarvestType().equals(toolClass)) - return -1; + if (toolClass == null || !this.getHarvestType().equals(toolClass)) return -1; - if(!stack.hasTagCompound()) - return -1; + if (!stack.hasTagCompound()) return -1; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); // broken tools suck. - if (tags.getBoolean("Broken")) - return 0; + if (tags.getBoolean("Broken")) return 0; // tadaaaa return tags.getInteger("HarvestLevel"); } - @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) - { - if (!stack.hasTagCompound()) - return 1.0f; + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!stack.hasTagCompound()) return 1.0f; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Broken")) - return 0.1f; + if (tags.getBoolean("Broken")) return 0.1f; - if(isEffective(block, meta)) - return calculateStrength(tags, block, meta); + if (isEffective(block, meta)) return calculateStrength(tags, block, meta); return super.getDigSpeed(stack, block, meta); } - public float calculateStrength (NBTTagCompound tags, Block block, int meta) - { + public float calculateStrength(NBTTagCompound tags, Block block, int meta) { int hlvl = block.getHarvestLevel(meta); - if (hlvl > tags.getInteger("HarvestLevel")) - return 0.1f; + if (hlvl > tags.getInteger("HarvestLevel")) return 0.1f; return AbilityHelper.calcToolSpeed(this, tags); } - public float breakSpeedModifier () - { + public float breakSpeedModifier() { return 1.0f; } - public float stoneboundModifier () - { + public float stoneboundModifier() { return 72f; } @Override - public boolean func_150897_b (Block block) - { + public boolean func_150897_b(Block block) { return isEffective(block.getMaterial()); } @Override - public String[] getTraits () - { - return new String[] { "harvest" }; + public String[] getTraits() { + return new String[] {"harvest"}; } - protected abstract Material[] getEffectiveMaterials (); + protected abstract Material[] getEffectiveMaterials(); - protected abstract String getHarvestType (); + protected abstract String getHarvestType(); @Override public Set getToolClasses(ItemStack stack) { Set set = new HashSet(); - if(stack != null && stack.getItem() instanceof HarvestTool) { + if (stack != null && stack.getItem() instanceof HarvestTool) { set.add(((HarvestTool) stack.getItem()).getHarvestType()); } return set; } - public boolean isEffective (Block block, int meta) - { - if(this.getHarvestType().equals(block.getHarvestTool(meta))) - return true; - + public boolean isEffective(Block block, int meta) { + if (this.getHarvestType().equals(block.getHarvestTool(meta))) return true; else return isEffective(block.getMaterial()); } - public boolean isEffective (Material material) - { - for (Material m : getEffectiveMaterials()) - if (m == material) - return true; + public boolean isEffective(Material material) { + for (Material m : getEffectiveMaterials()) if (m == material) return true; return false; } - //Right-click + // Right-click @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { /*if (world.isRemote) - return true;*/ + return true;*/ boolean used = false; int hotbarSlot = player.inventory.currentItem; int itemSlot = hotbarSlot == 0 ? 8 : hotbarSlot + 1; ItemStack nearbyStack = null; - if (hotbarSlot < 8) - { + if (hotbarSlot < 8) { nearbyStack = player.inventory.getStackInSlot(itemSlot); - if (nearbyStack != null) - { + if (nearbyStack != null) { Item item = nearbyStack.getItem(); - - if (item instanceof ItemBlock || (item != null && item == TinkerTools.openBlocksDevNull)) - { + + if (item instanceof ItemBlock || (item != null && item == TinkerTools.openBlocksDevNull)) { int posX = x; int posY = y; int posZ = z; - switch (side) - { + switch (side) { case 0: --posY; break; @@ -192,40 +165,34 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int break; } - AxisAlignedBB blockBounds = AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX + 1, posY + 1, posZ + 1); + AxisAlignedBB blockBounds = + AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX + 1, posY + 1, posZ + 1); AxisAlignedBB playerBounds = player.boundingBox; - if(item instanceof ItemBlock) - { + if (item instanceof ItemBlock) { Block blockToPlace = ((ItemBlock) item).field_150939_a; - if(blockToPlace.getMaterial().blocksMovement()) - { - if (playerBounds.intersectsWith(blockBounds)) - return false; + if (blockToPlace.getMaterial().blocksMovement()) { + if (playerBounds.intersectsWith(blockBounds)) return false; } } int dmg = nearbyStack.getItemDamage(); int count = nearbyStack.stackSize; - if (item == TinkerTools.openBlocksDevNull) - { - //Openblocks uses current inventory slot, so we have to do this... - player.inventory.currentItem=itemSlot; - item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); - player.inventory.currentItem=hotbarSlot; - player.swingItem(); - } - else - used = item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); + if (item == TinkerTools.openBlocksDevNull) { + // Openblocks uses current inventory slot, so we have to do this... + player.inventory.currentItem = itemSlot; + item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); + player.inventory.currentItem = hotbarSlot; + player.swingItem(); + } else used = item.onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ); // handle creative mode - if(player.capabilities.isCreativeMode) { + if (player.capabilities.isCreativeMode) { // fun fact: vanilla minecraft does it exactly the same way nearbyStack.setItemDamage(dmg); nearbyStack.stackSize = count; } - if (nearbyStack.stackSize < 1) - { + if (nearbyStack.stackSize < 1) { nearbyStack = null; player.inventory.setInventorySlotContents(itemSlot, null); } @@ -234,24 +201,23 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int } /* - if (used) //Update client - { - Packet103SetSlot packet = new Packet103SetSlot(player.openContainer.windowId, itemSlot, nearbyStack); - ((EntityPlayerMP)player).playerNetServerHandler.sendPacketToPlayer(packet); - } - */ + if (used) //Update client + { + Packet103SetSlot packet = new Packet103SetSlot(player.openContainer.windowId, itemSlot, nearbyStack); + ((EntityPlayerMP)player).playerNetServerHandler.sendPacketToPlayer(packet); + } + */ return used; } - public void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, int refY, int refZ) { + public void breakExtraBlock( + World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, int refY, int refZ) { // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events - if (world.isAirBlock(x, y, z)) - return; + if (world.isAirBlock(x, y, z)) return; // what? - if(!(playerEntity instanceof EntityPlayerMP)) - return; + if (!(playerEntity instanceof EntityPlayerMP)) return; EntityPlayerMP player = (EntityPlayerMP) playerEntity; // check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian @@ -260,21 +226,19 @@ public void breakExtraBlock(World world, int x, int y, int z, int sidehit, Entit int meta = world.getBlockMetadata(x, y, z); // only effective materials - if (!isEffective(block, meta)) - return; + if (!isEffective(block, meta)) return; Block refBlock = world.getBlock(refX, refY, refZ); float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ); - float strength = ForgeHooks.blockStrength(block, player, world, x,y,z); + float strength = ForgeHooks.blockStrength(block, player, world, x, y, z); // only harvestable blocks that aren't impossibly slow to harvest - if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f) - return; + if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength / strength > 10f) return; // send the blockbreak event - BlockEvent.BreakEvent event = ForgeHooks.onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x,y,z); - if(event.isCanceled()) - return; + BlockEvent.BreakEvent event = + ForgeHooks.onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z); + if (event.isCanceled()) return; if (player.capabilities.isCreativeMode) { block.onBlockHarvested(world, x, y, z, meta, player); @@ -290,7 +254,7 @@ public void breakExtraBlock(World world, int x, int y, int z, int sidehit, Entit // callback to the tool the player uses. Called on both sides. This damages the tool n stuff. ItemStack currentItem = player.getCurrentEquippedItem(); - if(currentItem != null) { + if (currentItem != null) { currentItem.func_150999_a(world, block, x, y, z, player); } @@ -299,13 +263,14 @@ public void breakExtraBlock(World world, int x, int y, int z, int sidehit, Entit // serverside we reproduce ItemInWorldManager.tryHarvestBlock // ItemInWorldManager.removeBlock - block.onBlockHarvested(world, x,y,z, meta, player); + block.onBlockHarvested(world, x, y, z, meta, player); - if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above + if (block.removedByPlayer( + world, player, x, y, z, true)) // boolean is if block can be harvested, checked above { - block.onBlockDestroyedByPlayer( world, x,y,z, meta); - block.harvestBlock(world, player, x,y,z, meta); - block.dropXpOnBlockBreak(world, x,y,z, event.getExpToDrop()); + block.onBlockDestroyedByPlayer(world, x, y, z, meta); + block.harvestBlock(world, player, x, y, z, meta); + block.dropXpOnBlockBreak(world, x, y, z, event.getExpToDrop()); } // always send block update to client @@ -313,31 +278,33 @@ public void breakExtraBlock(World world, int x, int y, int z, int sidehit, Entit } // client sided handling else { - //PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController; - // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send any new packets - // the code above, executed on the server, sends a block-updates that give us the correct state of the block we destroy. + // PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController; + // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send + // any new packets + // the code above, executed on the server, sends a block-updates that give us the correct state of the block + // we destroy. // following code can be found in PlayerControllerMP.onPlayerDestroyBlock world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); - if(block.removedByPlayer(world, player, x,y,z, true)) - { - block.onBlockDestroyedByPlayer(world, x,y,z, meta); + if (block.removedByPlayer(world, player, x, y, z, true)) { + block.onBlockDestroyedByPlayer(world, x, y, z, meta); } // callback to the tool ItemStack itemstack = player.getCurrentEquippedItem(); - if (itemstack != null) - { + if (itemstack != null) { itemstack.func_150999_a(world, block, x, y, z, player); - if (itemstack.stackSize == 0) - { + if (itemstack.stackSize == 0) { player.destroyCurrentEquippedItem(); } } // send an update to the server, so we get an update back - if(PHConstruct.extraBlockUpdates) - Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z, Minecraft.getMinecraft().objectMouseOver.sideHit)); + if (PHConstruct.extraBlockUpdates) + Minecraft.getMinecraft() + .getNetHandler() + .addToSendQueue(new C07PacketPlayerDigging( + 2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index c7bb6f9ec5e..01134b77156 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -6,7 +6,6 @@ import cpw.mods.fml.relauncher.*; import java.util.*; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.*; @@ -15,7 +14,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; -import tconstruct.TConstruct; import tconstruct.library.*; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.*; @@ -27,41 +25,38 @@ /** * NBTTags Main tag - InfiTool - * + * * @see ToolBuilder - * + * * Required: Head: Base and render tag, above the handle Handle: Base and * render tag, bottom layer - * + * * Damage: Replacement for metadata MaxDamage: ItemStacks only read * setMaxDamage() Broken: Represents whether the tool is broken (boolean) * Attack: How much damage a mob will take MiningSpeed: The speed at which * a tool mines - * + * * Others: Accessory: Base and tag, above head. Sword guards, binding, etc * Effects: Render tag, top layer. Fancy effects like moss or diamond edge. * Render order: Handle > Head > Accessory > Effect1 > Effect2 > Effect3 > * etc Unbreaking: Reinforced in-game, 10% chance to not use durability per * level Stonebound: Mines faster as the tool takes damage, but has less * attack Spiny: Opposite of stonebound - * + * * Modifiers have their own tags. * @see ItemModifier */ - @Optional.InterfaceList({ - @Optional.Interface(modid = "CoFHAPI|energy", iface = "cofh.api.energy.IEnergyContainerItem"), - @Optional.Interface(modid = "CoFHCore", iface = "cofh.core.item.IEqualityOverrideItem") + @Optional.Interface(modid = "CoFHAPI|energy", iface = "cofh.api.energy.IEnergyContainerItem"), + @Optional.Interface(modid = "CoFHCore", iface = "cofh.core.item.IEqualityOverrideItem") }) -public abstract class ToolCore extends Item implements IEnergyContainerItem, IEqualityOverrideItem, IModifyable -{ +public abstract class ToolCore extends Item implements IEnergyContainerItem, IEqualityOverrideItem, IModifyable { protected Random random = new Random(); protected int damageVsEntity; public static IIcon blankSprite; public static IIcon emptyIcon; - public ToolCore(int baseDamage) - { + public ToolCore(int baseDamage) { super(); this.maxStackSize = 1; this.setMaxDamage(100); @@ -74,51 +69,42 @@ public ToolCore(int baseDamage) } @Override - public String getBaseTagName () - { + public String getBaseTagName() { return "InfiTool"; } @Override - public String getModifyType () - { + public String getModifyType() { return "Tool"; } /** * Determines crafting behavior with regards to durability 0: None 1: Adds * handle modifier 2: Averages part with the rest of the tool (head) - * + * * @return type */ - - public int durabilityTypeHandle () - { + public int durabilityTypeHandle() { return 1; } - public int durabilityTypeAccessory () - { + public int durabilityTypeAccessory() { return 0; } - public int durabilityTypeExtra () - { + public int durabilityTypeExtra() { return 0; } - public int getModifierAmount () - { + public int getModifierAmount() { return 3; } - public String getToolName () - { + public String getToolName() { return this.getClass().getSimpleName(); } - public String getLocalizedToolName () - { + public String getLocalizedToolName() { return StatCollector.translateToLocal("tool." + getToolName().toLowerCase()); } @@ -131,7 +117,7 @@ public String getLocalizedToolName () public HashMap effectIcons = new HashMap(); public HashMap extraIcons = new HashMap(); - //Not liking this + // Not liking this public HashMap headStrings = new HashMap(); public HashMap brokenPartStrings = new HashMap(); public HashMap handleStrings = new HashMap(); @@ -141,36 +127,32 @@ public String getLocalizedToolName () @SideOnly(Side.CLIENT) @Override - public boolean requiresMultipleRenderPasses () - { + public boolean requiresMultipleRenderPasses() { return false; } @SideOnly(Side.CLIENT) @Override - public final int getRenderPasses (int metadata) - { + public final int getRenderPasses(int metadata) { return 0; } @Override @SideOnly(Side.CLIENT) - public boolean hasEffect (ItemStack par1ItemStack) - { + public boolean hasEffect(ItemStack par1ItemStack) { return false; } // Override me please! - public int getPartAmount () - { + public int getPartAmount() { return 3; } - public abstract String getIconSuffix (int partType); + public abstract String getIconSuffix(int partType); - public abstract String getEffectSuffix (); + public abstract String getEffectSuffix(); - public abstract String getDefaultFolder (); + public abstract String getDefaultFolder(); /** * Returns the COMPLETE resource path. @@ -178,35 +160,26 @@ public int getPartAmount () * * @return */ - public String getDefaultTexturePath() - { + public String getDefaultTexturePath() { return "tinker:" + getDefaultFolder(); } - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); - if (location.length > 3) - accessoryStrings.put(index, location[3]); - if (location.length > 4) - extraStrings.put(index, location[4]); + if (location.length > 3) accessoryStrings.put(index, location[3]); + if (location.length > 4) extraStrings.put(index, location[4]); } - public void registerAlternatePartPaths (int index, String[] location) - { - - } + public void registerAlternatePartPaths(int index, String[] location) {} - public void registerEffectPath (int index, String location) - { + public void registerEffectPath(int index, String location) { effectStrings.put(index, location); } @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { boolean minimalTextures = PHConstruct.minimalTextures; addIcons(headStrings, headIcons, iconRegister, getIconSuffix(0), minimalTextures); addIcons(brokenPartStrings, brokenIcons, iconRegister, getIconSuffix(1), minimalTextures); @@ -219,76 +192,64 @@ public void registerIcons (IIconRegister iconRegister) emptyIcon = iconRegister.registerIcon("tinker:blankface"); } - protected void addIcons(HashMap textures, HashMap icons, IIconRegister iconRegister, String standard, boolean defaultOnly) - { + protected void addIcons( + HashMap textures, + HashMap icons, + IIconRegister iconRegister, + String standard, + boolean defaultOnly) { icons.clear(); - if(!defaultOnly) // compatibility mode: no specific textures - for(Map.Entry entry : textures.entrySet()) - { - if(TextureHelper.itemTextureExists(entry.getValue())) + if (!defaultOnly) // compatibility mode: no specific textures + for (Map.Entry entry : textures.entrySet()) { + if (TextureHelper.itemTextureExists(entry.getValue())) icons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue())); } - if(standard != null && !standard.isEmpty()) { - standard = getDefaultTexturePath() + "/" + standard; + if (standard != null && !standard.isEmpty()) { + standard = getDefaultTexturePath() + "/" + standard; icons.put(-1, iconRegister.registerIcon(standard)); } } - @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) - { + public IIcon getIconFromDamage(int meta) { return blankSprite; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (ItemStack stack, int renderPass) - { + public IIcon getIcon(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { + if (renderPass < getPartAmount()) { // Handle - if (renderPass == 0) - return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle")); + if (renderPass == 0) return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle")); // Head - else if (renderPass == 1) - { - if (tags.getBoolean("Broken")) - return getCorrectIcon(brokenIcons, tags.getInteger("RenderHead")); - else - return getCorrectIcon(headIcons, tags.getInteger("RenderHead")); + else if (renderPass == 1) { + if (tags.getBoolean("Broken")) return getCorrectIcon(brokenIcons, tags.getInteger("RenderHead")); + else return getCorrectIcon(headIcons, tags.getInteger("RenderHead")); } // Accessory - else if (renderPass == 2) - return getCorrectIcon(accessoryIcons, tags.getInteger("RenderAccessory")); + else if (renderPass == 2) return getCorrectIcon(accessoryIcons, tags.getInteger("RenderAccessory")); // Extra - else if (renderPass == 3) - return getCorrectIcon(extraIcons, tags.getInteger("RenderExtra")); + else if (renderPass == 3) return getCorrectIcon(extraIcons, tags.getInteger("RenderExtra")); } // Effects - else if (renderPass <= 10) - { + else if (renderPass <= 10) { String effect = "Effect" + (1 + renderPass - getPartAmount()); - if(tags.hasKey(effect)) - return effectIcons.get(tags.getInteger(effect)); + if (tags.hasKey(effect)) return effectIcons.get(tags.getInteger(effect)); } return blankSprite; } return emptyIcon; } - protected IIcon getCorrectIcon(Map icons, int id) - { - if(icons.containsKey(id)) - return icons.get(id); + protected IIcon getCorrectIcon(Map icons, int id) { + if (icons.containsKey(id)) return icons.get(id); // default icon return icons.get(-1); @@ -297,59 +258,51 @@ protected IIcon getCorrectIcon(Map icons, int id) /* Tags and information about the tool */ @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("Energy")) - { + if (tags.hasKey("Energy")) { String color = ""; int RF = tags.getInteger("Energy"); - if (RF != 0) - { - if (RF <= this.getMaxEnergyStored(stack) / 3) - color = "\u00a74"; - else if (RF > this.getMaxEnergyStored(stack) * 2 / 3) - color = "\u00a72"; - else - color = "\u00a76"; + if (RF != 0) { + if (RF <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; + else if (RF > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; + else color = "\u00a76"; } - String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + String energy = new StringBuilder() + .append(color) + .append(tags.getInteger("Energy")) + .append("/") + .append(getMaxEnergyStored(stack)) + .append(" RF") + .toString(); list.add(energy); } - if (tags.hasKey("InfiTool")) - { + if (tags.hasKey("InfiTool")) { boolean broken = tags.getCompoundTag("InfiTool").getBoolean("Broken"); - if (broken) - list.add("\u00A7o" + StatCollector.translateToLocal("tool.core.broken")); - else - { + if (broken) list.add("\u00A7o" + StatCollector.translateToLocal("tool.core.broken")); + else { int head = tags.getCompoundTag("InfiTool").getInteger("Head"); int handle = tags.getCompoundTag("InfiTool").getInteger("Handle"); int binding = tags.getCompoundTag("InfiTool").getInteger("Accessory"); int extra = tags.getCompoundTag("InfiTool").getInteger("Extra"); String headName = getAbilityNameForType(head, 0); - if (!headName.equals("")) - list.add(getStyleForType(head) + headName); + if (!headName.equals("")) list.add(getStyleForType(head) + headName); String handleName = getAbilityNameForType(handle, 1); - if (!handleName.equals("") && handle != head) - list.add(getStyleForType(handle) + handleName); + if (!handleName.equals("") && handle != head) list.add(getStyleForType(handle) + handleName); - if (getPartAmount() >= 3) - { + if (getPartAmount() >= 3) { String bindingName = getAbilityNameForType(binding, 2); if (!bindingName.equals("") && binding != head && binding != handle) list.add(getStyleForType(binding) + bindingName); } - if (getPartAmount() >= 4) - { + if (getPartAmount() >= 4) { String extraName = getAbilityNameForType(extra, 3); if (!extraName.equals("") && extra != head && extra != handle && extra != binding) list.add(getStyleForType(extra) + extraName); @@ -357,55 +310,50 @@ else if (RF > this.getMaxEnergyStored(stack) * 2 / 3) int unbreaking = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); String reinforced = getReinforcedName(head, handle, binding, extra, unbreaking); - if (!reinforced.equals("")) - list.add(reinforced); + if (!reinforced.equals("")) list.add(reinforced); boolean displayToolTips = true; int tipNum = 0; - while (displayToolTips) - { + while (displayToolTips) { tipNum++; String tooltip = "Tooltip" + tipNum; - if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) - { + if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) { String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); if (!tipName.equals("")) { // let's see if we can translate it somehow // strip color information - String locString = "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); + String locString = + "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); locString = locString.replace(" ", ""); - if(StatCollector.canTranslate(locString)) - tipName = tipName.replace(EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); + if (StatCollector.canTranslate(locString)) + tipName = tipName.replace( + EnumChatFormatting.getTextWithoutFormattingCodes(tipName), + StatCollector.translateToLocal(locString)); list.add(tipName); } - } - else - displayToolTips = false; + } else displayToolTips = false; } } } list.add(""); int attack = (int) (tags.getCompoundTag("InfiTool").getInteger("Attack") * this.getDamageModifier()); - list.add("\u00A79+" + attack + " " + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); - + list.add("\u00A79+" + attack + " " + + StatCollector.translateToLocalFormatted("attribute.name.generic.attackDamage")); } - public static String getStyleForType (int type) - { + public static String getStyleForType(int type) { return TConstructRegistry.getMaterial(type).style(); } /** * Returns the localized name of the materials ability. Only use this for display purposes, not for logic. */ - public String getAbilityNameForType (int type, int part) - { + public String getAbilityNameForType(int type, int part) { return TConstructRegistry.getMaterial(type).ability(); } - public String getReinforcedName (int head, int handle, int accessory, int extra, int unbreaking) - { + public String getReinforcedName(int head, int handle, int accessory, int extra, int unbreaking) { tconstruct.library.tools.ToolMaterial headMat = TConstructRegistry.getMaterial(head); tconstruct.library.tools.ToolMaterial handleMat = TConstructRegistry.getMaterial(handle); tconstruct.library.tools.ToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory); @@ -414,31 +362,25 @@ public String getReinforcedName (int head, int handle, int accessory, int extra, int reinforced = 0; String style = ""; int current = headMat.reinforced(); - if (current > 0) - { + if (current > 0) { style = headMat.style(); reinforced = current; } current = handleMat.reinforced(); - if (current > 0 && current > reinforced) - { + if (current > 0 && current > reinforced) { style = handleMat.style(); reinforced = current; } - if (getPartAmount() >= 3) - { + if (getPartAmount() >= 3) { current = accessoryMat.reinforced(); - if (current > 0 && current > reinforced) - { + if (current > 0 && current > reinforced) { style = accessoryMat.style(); reinforced = current; } } - if (getPartAmount() >= 4) - { + if (getPartAmount() >= 4) { current = extraMat.reinforced(); - if (current > 0 && current > reinforced) - { + if (current > 0 && current > reinforced) { style = extraMat.style(); reinforced = current; } @@ -446,109 +388,99 @@ public String getReinforcedName (int head, int handle, int accessory, int extra, reinforced += unbreaking - reinforced; - if (reinforced > 0) - { + if (reinforced > 0) { return style + getReinforcedString(reinforced); } return ""; } - String getReinforcedString (int reinforced) - { - if (reinforced > 9) - return StatCollector.translateToLocal("tool.unbreakable"); + String getReinforcedString(int reinforced) { + if (reinforced > 9) return StatCollector.translateToLocal("tool.unbreakable"); String ret = StatCollector.translateToLocal("tool.reinforced") + " "; - switch (reinforced) - { - case 1: - ret += "I"; - break; - case 2: - ret += "II"; - break; - case 3: - ret += "III"; - break; - case 4: - ret += "IV"; - break; - case 5: - ret += "V"; - break; - case 6: - ret += "VI"; - break; - case 7: - ret += "VII"; - break; - case 8: - ret += "VIII"; - break; - case 9: - ret += "IX"; - break; - default: - ret += "X"; - break; + switch (reinforced) { + case 1: + ret += "I"; + break; + case 2: + ret += "II"; + break; + case 3: + ret += "III"; + break; + case 4: + ret += "IV"; + break; + case 5: + ret += "V"; + break; + case 6: + ret += "VI"; + break; + case 7: + ret += "VII"; + break; + case 8: + ret += "VIII"; + break; + case 9: + ret += "IX"; + break; + default: + ret += "X"; + break; } return ret; } // Used for sounds and the like - public void onEntityDamaged (World world, EntityLivingBase player, Entity entity) - { - - } + public void onEntityDamaged(World world, EntityLivingBase player, Entity entity) {} /* Creative mode tools */ @Override - public void getSubItems (Item id, CreativeTabs tab, List list) - { + public void getSubItems(Item id, CreativeTabs tab, List list) { Iterator iter = TConstructRegistry.toolMaterials.entrySet().iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); tconstruct.library.tools.ToolMaterial material = (tconstruct.library.tools.ToolMaterial) pairs.getValue(); buildTool((Integer) pairs.getKey(), ToolBuilder.defaultToolName(material, this), list); } } - public void buildTool (int id, String name, List list) - { + public void buildTool(int id, String name, List list) { Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null; Item extra = getExtraItem(); ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name); - if (tool != null) - { + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, id), + new ItemStack(getHandleItem(), 1, id), + accessoryStack, + extraStack, + name); + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); } } - public abstract Item getHeadItem (); + public abstract Item getHeadItem(); - public abstract Item getAccessoryItem (); + public abstract Item getAccessoryItem(); - public Item getExtraItem () - { + public Item getExtraItem() { return null; } - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerTools.toolRod; } /* Updating */ @Override - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { mod.updateTool(this, stack, world, entity); } } @@ -556,95 +488,78 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo /* Tool uses */ // Types - public abstract String[] getTraits (); + public abstract String[] getTraits(); // Mining @Override - public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) - { - if(!stack.hasTagCompound()) - return false; + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + if (!stack.hasTagCompound()) return false; boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - if (mod.beforeBlockBreak(this, stack, x, y, z, player)) - cancelHarvest = true; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { + if (mod.beforeBlockBreak(this, stack, x, y, z, player)) cancelHarvest = true; } return cancelHarvest; } @Override - public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) - { - if(!itemstack.hasTagCompound()) - return false; + public boolean onBlockDestroyed( + ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + if (!itemstack.hasTagCompound()) return false; // callbacks! for (ActiveToolMod mod : TConstructRegistry.activeModifiers) mod.afterBlockBreak(this, itemstack, block, x, y, z, player); - if (block != null && (double) block.getBlockHardness(world, x, y, z) != 0.0D) - { + if (block != null && (double) block.getBlockHardness(world, x, y, z) != 0.0D) { return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } return true; } @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) - { - if(!stack.hasTagCompound()) - return 0f; - + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!stack.hasTagCompound()) return 0f; + NBTTagCompound tags = stack.getTagCompound(); - if (tags.getCompoundTag("InfiTool").getBoolean("Broken")) - return 0.1f; + if (tags.getCompoundTag("InfiTool").getBoolean("Broken")) return 0.1f; return 1f; } // Attacking @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) - { + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { return AbilityHelper.onLeftClickEntity(stack, player, entity, this, 0); } @Override - public boolean hitEntity (ItemStack stack, EntityLivingBase mob, EntityLivingBase player) - { + public boolean hitEntity(ItemStack stack, EntityLivingBase mob, EntityLivingBase player) { return true; } - public boolean pierceArmor () - { + public boolean pierceArmor() { return false; } - public float chargeAttack () - { + public float chargeAttack() { return 1f; } - public int getDamageVsEntity (Entity par1Entity) - { + public int getDamageVsEntity(Entity par1Entity) { return this.damageVsEntity; } // Changes how much durability the base tool has - public float getDurabilityModifier () - { + public float getDurabilityModifier() { return 1f; } - public float getRepairCost () - { + public float getRepairCost() { return getDurabilityModifier(); } - public float getDamageModifier () - { + public float getDamageModifier() { return 1.0f; } @@ -652,72 +567,67 @@ public float getDamageModifier () public int getColorFromItemStack(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { - switch(renderPass) - { - case 0: return getCorrectColor(stack, renderPass, tags, "Handle", handleIcons); - case 1: return tags.getBoolean("Broken") ? getCorrectColor(stack, renderPass, tags, "Head", brokenIcons) : getCorrectColor(stack, renderPass, tags, "Head", headIcons); - case 2: return getCorrectColor(stack, renderPass, tags, "Accessory", accessoryIcons); - case 3: return getCorrectColor(stack, renderPass, tags, "Extra", extraIcons); + if (renderPass < getPartAmount()) { + switch (renderPass) { + case 0: + return getCorrectColor(stack, renderPass, tags, "Handle", handleIcons); + case 1: + return tags.getBoolean("Broken") + ? getCorrectColor(stack, renderPass, tags, "Head", brokenIcons) + : getCorrectColor(stack, renderPass, tags, "Head", headIcons); + case 2: + return getCorrectColor(stack, renderPass, tags, "Accessory", accessoryIcons); + case 3: + return getCorrectColor(stack, renderPass, tags, "Extra", extraIcons); } } } return super.getColorFromItemStack(stack, renderPass); } - protected int getCorrectColor(ItemStack stack, int renderPass, NBTTagCompound tags, String key, Map map) - { + protected int getCorrectColor( + ItemStack stack, int renderPass, NBTTagCompound tags, String key, Map map) { // custom coloring - if(tags.hasKey(key + "Color")) - return tags.getInteger(key + "Color"); + if (tags.hasKey(key + "Color")) return tags.getInteger(key + "Color"); // custom texture? Integer matId = tags.getInteger("Render" + key); - if(map.containsKey(matId)) - return super.getColorFromItemStack(stack, renderPass); + if (map.containsKey(matId)) return super.getColorFromItemStack(stack, renderPass); // color default texture with material color return getDefaultColor(renderPass, matId); } - protected int getDefaultColor(int renderPass, int materialID) - { - if(TConstructRegistry.getMaterial(materialID) != null) + protected int getDefaultColor(int renderPass, int materialID) { + if (TConstructRegistry.getMaterial(materialID) != null) return TConstructRegistry.getMaterial(materialID).primaryColor(); return 0xffffffff; } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { boolean used = false; int hotbarSlot = player.inventory.currentItem; int itemSlot = hotbarSlot == 0 ? 8 : hotbarSlot + 1; ItemStack nearbyStack = null; - if (hotbarSlot < 8) - { + if (hotbarSlot < 8) { nearbyStack = player.inventory.getStackInSlot(itemSlot); - if (nearbyStack != null) - { + if (nearbyStack != null) { Item item = nearbyStack.getItem(); - if (item instanceof ItemPotion && ((ItemPotion) item).isSplash(nearbyStack.getItemDamage())) - { + if (item instanceof ItemPotion && ((ItemPotion) item).isSplash(nearbyStack.getItemDamage())) { nearbyStack = item.onItemRightClick(nearbyStack, world, player); - if (nearbyStack.stackSize < 1) - { + if (nearbyStack.stackSize < 1) { nearbyStack = null; player.inventory.setInventorySlotContents(itemSlot, null); } } // throw shurikens! - if(item != null && item == TinkerWeaponry.shuriken) { + if (item != null && item == TinkerWeaponry.shuriken) { item.onItemRightClick(nearbyStack, world, player); } } @@ -727,73 +637,62 @@ public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer pl /* Vanilla overrides */ @Override - public boolean isItemTool (ItemStack par1ItemStack) - { + public boolean isItemTool(ItemStack par1ItemStack) { return false; } @Override - public boolean getIsRepairable (ItemStack par1ItemStack, ItemStack par2ItemStack) - { + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return false; } @Override - public boolean isRepairable () - { + public boolean isRepairable() { return false; } @Override - public int getItemEnchantability () - { + public int getItemEnchantability() { return 0; } @Override - public boolean isFull3D () - { + public boolean isFull3D() { return true; } @Override @SideOnly(Side.CLIENT) - public boolean hasEffect (ItemStack par1ItemStack, int pass) - { + public boolean hasEffect(ItemStack par1ItemStack, int pass) { return false; } /* Proper stack damage */ @Override public boolean showDurabilityBar(ItemStack stack) { - if(!stack.hasTagCompound()) - return false; - + if (!stack.hasTagCompound()) return false; + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); return !tags.getBoolean("Broken") && getDamage(stack) > 0; } @Override - public int getMaxDamage (ItemStack stack) - { + public int getMaxDamage(ItemStack stack) { return 100; } @Override public int getDamage(ItemStack stack) { NBTTagCompound tags = stack.getTagCompound(); - if (tags == null) - { + if (tags == null) { return 0; } - if (tags.hasKey("Energy")) - { + if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); int max = getMaxEnergyStored(stack); - if(energy > 0) { + if (energy > 0) { int damage = ((max - energy) * 100) / max; - if(damage == 0 && max-energy > 0) - damage = 1; + if (damage == 0 && max - energy > 0) damage = 1; super.setDamage(stack, damage); return damage; } @@ -801,13 +700,10 @@ public int getDamage(ItemStack stack) { int dur = tags.getCompoundTag("InfiTool").getInteger("Damage"); int max = tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); int damage = 0; - if(max > 0) - damage = (dur*100)/max; + if (max > 0) damage = (dur * 100) / max; // rounding. - if(damage == 0 && dur > 0) - damage = 1; - + if (damage == 0 && dur > 0) damage = 1; // synchronize values with stack.. super.setDamage(stack, damage); @@ -819,25 +715,21 @@ public int getDisplayDamage(ItemStack stack) { return getDamage(stack); } - @Override public void setDamage(ItemStack stack, int damage) { int change = damage - stack.getItemDamage(); - if(change == 0) - return; + if (change == 0) return; AbilityHelper.damageTool(stack, change, null, false); getDamage(stack); // called to synchronize with itemstack value } /* Prevent tools from dying */ - public boolean hasCustomEntity (ItemStack stack) - { + public boolean hasCustomEntity(ItemStack stack) { return true; } - public Entity createEntity (World world, Entity location, ItemStack itemstack) - { + public Entity createEntity(World world, Entity location, ItemStack itemstack) { return new FancyEntityItem(world, location, itemstack); } @@ -851,56 +743,54 @@ public Entity createEntity (World world, Entity location, ItemStack itemstack) /* IEnergyContainerItem */ @Override @Optional.Method(modid = "CoFHAPI|energy") - public int receiveEnergy (ItemStack container, int maxReceive, boolean simulate) - { + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { NBTTagCompound tags = container.getTagCompound(); - if (tags == null || !tags.hasKey("Energy")) - return 0; + if (tags == null || !tags.hasKey("Energy")) return 0; int energy = tags.getInteger("Energy"); - int energyReceived = tags.hasKey("EnergyReceiveRate") ? tags.getInteger("EnergyReceiveRate") : this.maxReceive; // backup value + int energyReceived = tags.hasKey("EnergyReceiveRate") + ? tags.getInteger("EnergyReceiveRate") + : this.maxReceive; // backup value int maxEnergy = tags.hasKey("EnergyMax") ? tags.getInteger("EnergyMax") : this.capacity; // backup value // calculate how much we can receive energyReceived = Math.min(maxEnergy - energy, Math.min(energyReceived, maxReceive)); - if (!simulate) - { + if (!simulate) { energy += energyReceived; tags.setInteger("Energy", energy); - //container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 2) / getMaxEnergyStored(container)); + // container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 2) / + // getMaxEnergyStored(container)); } return energyReceived; } @Override @Optional.Method(modid = "CoFHAPI|energy") - public int extractEnergy (ItemStack container, int maxExtract, boolean simulate) - { + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { NBTTagCompound tags = container.getTagCompound(); - if (tags == null || !tags.hasKey("Energy")) - { + if (tags == null || !tags.hasKey("Energy")) { return 0; } int energy = tags.getInteger("Energy"); - int energyExtracted = tags.hasKey("EnergyExtractionRate") ? tags.getInteger("EnergyExtractionRate") : this.maxExtract; // backup value + int energyExtracted = tags.hasKey("EnergyExtractionRate") + ? tags.getInteger("EnergyExtractionRate") + : this.maxExtract; // backup value // calculate how much we can extract energyExtracted = Math.min(energy, Math.min(energyExtracted, maxExtract)); - if (!simulate) - { + if (!simulate) { energy -= energyExtracted; tags.setInteger("Energy", energy); - //container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 1) / getMaxEnergyStored(container)); + // container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 1) / + // getMaxEnergyStored(container)); } return energyExtracted; } @Override @Optional.Method(modid = "CoFHAPI|energy") - public int getEnergyStored (ItemStack container) - { + public int getEnergyStored(ItemStack container) { NBTTagCompound tags = container.getTagCompound(); - if (tags == null || !tags.hasKey("Energy")) - { + if (tags == null || !tags.hasKey("Energy")) { return 0; } return tags.getInteger("Energy"); @@ -908,14 +798,11 @@ public int getEnergyStored (ItemStack container) @Override @Optional.Method(modid = "CoFHAPI|energy") - public int getMaxEnergyStored (ItemStack container) - { + public int getMaxEnergyStored(ItemStack container) { NBTTagCompound tags = container.getTagCompound(); - if (tags == null || !tags.hasKey("Energy")) - return 0; + if (tags == null || !tags.hasKey("Energy")) return 0; - if (tags.hasKey("EnergyMax")) - return tags.getInteger("EnergyMax"); + if (tags.hasKey("EnergyMax")) return tags.getInteger("EnergyMax"); // backup return capacity; } @@ -923,15 +810,12 @@ public int getMaxEnergyStored (ItemStack container) @Override @Optional.Method(modid = "CoFHCore") public boolean isLastHeldItemEqual(ItemStack current, ItemStack previous) { - if(!current.hasTagCompound() || !previous.hasTagCompound()) - return false; + if (!current.hasTagCompound() || !previous.hasTagCompound()) return false; NBTTagCompound curTags = current.getTagCompound(); NBTTagCompound prevTags = previous.getTagCompound(); - if(curTags == prevTags) - return true; - if(!curTags.hasKey("InfiTool") || !prevTags.hasKey("InfiTool")) - return false; + if (curTags == prevTags) return true; + if (!curTags.hasKey("InfiTool") || !prevTags.hasKey("InfiTool")) return false; // create copies so we don't modify the original curTags = (NBTTagCompound) curTags.copy(); diff --git a/src/main/java/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java index 2d1658ae8b7..5ab21be7372 100644 --- a/src/main/java/tconstruct/library/tools/ToolMaterial.java +++ b/src/main/java/tconstruct/library/tools/ToolMaterial.java @@ -5,8 +5,7 @@ /* * Dynamic substitute for an enum. It carries a lot of information */ -public class ToolMaterial -{ +public class ToolMaterial { public final String materialName; public final int harvestLevel; public final int durability; @@ -22,34 +21,92 @@ public class ToolMaterial @Deprecated public String displayName; + @Deprecated public String ability; @Deprecated - public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) - { + public ToolMaterial( + String name, + String displayName, + int level, + int durability, + int speed, + int damage, + float handle, + int reinforced, + float stonebound, + String style, + String ability) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); } @Deprecated - public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) - { + public ToolMaterial( + String name, + int level, + int durability, + int speed, + int damage, + float handle, + int reinforced, + float stonebound, + String style, + String ability) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); } @Deprecated - public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style) - { + public ToolMaterial( + String name, + int level, + int durability, + int speed, + int damage, + float handle, + int reinforced, + float stonebound, + String style) { this(name, level, durability, speed, damage, handle, reinforced, stonebound, style, 0xFFFFFF); } - public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) - { - this(name, "material." + name.toLowerCase().replaceAll(" ", ""), level, durability, speed, damage, handle, reinforced, stonebound, style, primaryColor); - } - - public ToolMaterial(String name, String localizationString, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) - { + public ToolMaterial( + String name, + int level, + int durability, + int speed, + int damage, + float handle, + int reinforced, + float stonebound, + String style, + int primaryColor) { + this( + name, + "material." + name.toLowerCase().replaceAll(" ", ""), + level, + durability, + speed, + damage, + handle, + reinforced, + stonebound, + style, + primaryColor); + } + + public ToolMaterial( + String name, + String localizationString, + int level, + int durability, + int speed, + int damage, + float handle, + int reinforced, + float stonebound, + String style, + int primaryColor) { this.materialName = name; this.harvestLevel = level; this.durability = durability; @@ -67,66 +124,54 @@ public ToolMaterial(String name, String localizationString, int level, int durab this.ability = ability(); } - public String name () - { + public String name() { return materialName; } - public String localizedName () - { + public String localizedName() { return StatCollector.translateToLocal(localizationString); } - public String prefixName () - { + public String prefixName() { // check if there's a special name, otherwise use the regular one if (StatCollector.canTranslate(String.format("%s.display", localizationString))) return StatCollector.translateToLocal(String.format("%s.display", localizationString)); return localizedName(); } - public int durability () - { + public int durability() { return this.durability; } - public int toolSpeed () - { + public int toolSpeed() { return this.miningspeed; } - public int attack () - { + public int attack() { return this.attack; } - public int harvestLevel () - { + public int harvestLevel() { return this.harvestLevel; } - public float handleDurability () - { + public float handleDurability() { return this.handleModifier; } - public int reinforced () - { + public int reinforced() { return this.reinforced; } - public float shoddy () - { + public float shoddy() { return this.stonebound; } - public String style () - { + public String style() { return this.tipStyle; } - public int primaryColor () - { + public int primaryColor() { return this.primaryColor; } @@ -134,8 +179,7 @@ public int primaryColor () * Returns the ability of the tool to display. * ONLY USE THIS FOR DISPLAY PURPOSES. It is not data you can rely on. Use the material-ids for that. */ - public String ability () - { + public String ability() { if (StatCollector.canTranslate(String.format("%s.ability", localizationString))) return StatCollector.translateToLocal(String.format("%s.ability", localizationString)); return ""; diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index dced6c211b6..e06495a82e3 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -19,37 +19,29 @@ @Optional.Interface(modid = "ZeldaItemAPI", iface = "zeldaswordskills.api.item.ISword"), @Optional.Interface(modid = "DynamicSkillsAPI", iface = "dynamicswordskills.api.ISword") }) -public abstract class Weapon extends ToolCore implements IBattlegearWeapon, zeldaswordskills.api.item.ISword, dynamicswordskills.api.ISword -{ +public abstract class Weapon extends ToolCore + implements IBattlegearWeapon, zeldaswordskills.api.item.ISword, dynamicswordskills.api.ISword { - public Weapon(int baseDamage) - { + public Weapon(int baseDamage) { super(baseDamage); } - protected float baseSpeed () - { + protected float baseSpeed() { return 1.5f; } - protected float effectiveSpeed () - { + protected float effectiveSpeed() { return 15f; } @Override - public float getDigSpeed (ItemStack stack, Block block, int meta) - { - if(!stack.hasTagCompound()) - return 0f; - - if (stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) - return 0.1f; - - for (int i = 0; i < web.length; i++) - { - if (web[i] == block.getMaterial()) - { + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!stack.hasTagCompound()) return 0f; + + if (stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) return 0.1f; + + for (int i = 0; i < web.length; i++) { + if (web[i] == block.getMaterial()) { return effectiveSpeed(); } } @@ -61,8 +53,7 @@ public float getDigSpeed (ItemStack stack, Block block, int meta) * is being used */ @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.block; } @@ -70,8 +61,7 @@ public EnumAction getItemUseAction (ItemStack par1ItemStack) * How long it takes to use or consume an item */ @Override - public int getMaxItemUseDuration (ItemStack par1ItemStack) - { + public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 72000; } @@ -80,15 +70,23 @@ public int getMaxItemUseDuration (ItemStack par1ItemStack) * pressed. Args: itemStack, world, entityPlayer */ @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); return stack; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { return false; } @@ -96,32 +94,25 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int * Returns if the item (tool) can harvest results from the block type. */ @Override - public boolean canHarvestBlock (Block block, ItemStack is) - { - for (int i = 0; i < web.length; i++) - { - if (block.getMaterial() == web[i]) - return true; + public boolean canHarvestBlock(Block block, ItemStack is) { + for (int i = 0; i < web.length; i++) { + if (block.getMaterial() == web[i]) return true; } return super.canHarvestBlock(block, is); } - protected Material[] getEffectiveMaterials () - { + protected Material[] getEffectiveMaterials() { return web; } @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 2.5F; player.movementInput.moveStrafe *= 2.5F; } @@ -129,21 +120,18 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo } @Override - public String[] getTraits () - { - return new String[] { "weapon", "melee" }; + public String[] getTraits() { + return new String[] {"weapon", "melee"}; } - public static Material[] web = new Material[] { Material.web, Material.cloth, Material.coral, Material.cake }; + public static Material[] web = new Material[] {Material.web, Material.cloth, Material.coral, Material.cake}; public static Material[] none = new Material[0]; - /*---- Battlegear Support START ----*/ @Override @Optional.Method(modid = "battlegear2") - public boolean sheatheOnBack(ItemStack item) - { + public boolean sheatheOnBack(ItemStack item) { return true; } @@ -155,7 +143,8 @@ public boolean isOffhandHandDual(ItemStack off) { @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity( + PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { return true; } @@ -180,10 +169,11 @@ public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, It @Override @Optional.Method(modid = "battlegear2") public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { - if(offhand == null) - return true; + if (offhand == null) return true; - return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe) + return (mainhand != null + && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } diff --git a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java index 784849cbe26..591abb10a59 100644 --- a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java +++ b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java @@ -4,8 +4,6 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.dispenser.IPosition; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -17,29 +15,29 @@ public abstract class BehaviorProjectileBaseDispense extends BehaviorDefaultDisp * Dispense the specified stack, play the dispense sound and spawn particles. */ @Override - public ItemStack dispenseStack(IBlockSource blockSource, ItemStack stack) - { + public ItemStack dispenseStack(IBlockSource blockSource, ItemStack stack) { World world = blockSource.getWorld(); IPosition iposition = BlockDispenser.func_149939_a(blockSource); EnumFacing enumfacing = BlockDispenser.func_149937_b(blockSource.getBlockMetadata()); ItemStack reference; - if(stack.getItem() instanceof IAmmo) - { + if (stack.getItem() instanceof IAmmo) { IAmmo ammo = (IAmmo) stack.getItem(); // needs ammo to shoot - if(ammo.getAmmoCount(stack) <= 0) - return stack; + if (ammo.getAmmoCount(stack) <= 0) return stack; ammo.consumeAmmo(1, stack); reference = stack.copy(); - ((IAmmo)reference.getItem()).setAmmo(1, reference); - } - else - reference = stack.splitStack(1); + ((IAmmo) reference.getItem()).setAmmo(1, reference); + } else reference = stack.splitStack(1); ProjectileBase projectile = this.getProjectileEntity(world, iposition, reference); - projectile.setThrowableHeading((double)enumfacing.getFrontOffsetX(), (double)((float)enumfacing.getFrontOffsetY() + ballistic()), (double)enumfacing.getFrontOffsetZ(), this.accuraccy(), this.speed()); + projectile.setThrowableHeading( + (double) enumfacing.getFrontOffsetX(), + (double) ((float) enumfacing.getFrontOffsetY() + ballistic()), + (double) enumfacing.getFrontOffsetZ(), + this.accuraccy(), + this.speed()); projectile.returnStack = reference; projectile.canBePickedUp = 1; world.spawnEntityInWorld(projectile); @@ -50,8 +48,7 @@ public ItemStack dispenseStack(IBlockSource blockSource, ItemStack stack) /** * Play the dispense sound from the specified block. */ - protected void playDispenseSound(IBlockSource p_82485_1_) - { + protected void playDispenseSound(IBlockSource p_82485_1_) { p_82485_1_.getWorld().playAuxSFX(1002, p_82485_1_.getXInt(), p_82485_1_.getYInt(), p_82485_1_.getZInt(), 0); } @@ -60,15 +57,15 @@ protected void playDispenseSound(IBlockSource p_82485_1_) */ protected abstract ProjectileBase getProjectileEntity(World world, IPosition position, ItemStack stack); - protected float speed() - { + protected float speed() { return 6.0F; } - protected float accuraccy() - { + protected float accuraccy() { return 1.1F; } - protected float ballistic() { return 0.1f; } + protected float ballistic() { + return 0.1f; + } } diff --git a/src/main/java/tconstruct/library/util/HarvestLevels.java b/src/main/java/tconstruct/library/util/HarvestLevels.java index 0664f9fea1f..3925cde3ba7 100644 --- a/src/main/java/tconstruct/library/util/HarvestLevels.java +++ b/src/main/java/tconstruct/library/util/HarvestLevels.java @@ -6,26 +6,20 @@ /** * Lookup for the name of each harvest level. Use this clientside only for display purposes. */ -public final class HarvestLevels -{ - private HarvestLevels() - { - } // non-instantiable +public final class HarvestLevels { + private HarvestLevels() {} // non-instantiable public static final Map harvestLevelNames = new HashMap(); - public static String getHarvestLevelName (int num) - { + public static String getHarvestLevelName(int num) { return harvestLevelNames.containsKey(num) ? harvestLevelNames.get(num) : String.valueOf(num); } // initialization - static - { + static { String base = "gui.mining"; int i = 0; - while (StatCollector.canTranslate(String.format("%s%d", base, i + 1))) - { + while (StatCollector.canTranslate(String.format("%s%d", base, i + 1))) { harvestLevelNames.put(i, StatCollector.translateToLocal(String.format("%s%d", base, i + 1))); i++; } diff --git a/src/main/java/tconstruct/library/util/IPattern.java b/src/main/java/tconstruct/library/util/IPattern.java index 9cee2321147..72d3a47ae20 100644 --- a/src/main/java/tconstruct/library/util/IPattern.java +++ b/src/main/java/tconstruct/library/util/IPattern.java @@ -3,9 +3,8 @@ import net.minecraft.item.ItemStack; import tconstruct.library.crafting.PatternBuilder.MaterialSet; -public interface IPattern -{ - public int getPatternCost (ItemStack pattern); +public interface IPattern { + public int getPatternCost(ItemStack pattern); - public ItemStack getPatternOutput (ItemStack pattern, ItemStack input, MaterialSet set); + public ItemStack getPatternOutput(ItemStack pattern, ItemStack input, MaterialSet set); } diff --git a/src/main/java/tconstruct/library/util/IToolPart.java b/src/main/java/tconstruct/library/util/IToolPart.java index 5df9d75f2fb..f8ab58f41c7 100644 --- a/src/main/java/tconstruct/library/util/IToolPart.java +++ b/src/main/java/tconstruct/library/util/IToolPart.java @@ -2,14 +2,13 @@ import net.minecraft.item.ItemStack; -public interface IToolPart -{ +public interface IToolPart { /** * Parts to build tools from. ex: Pickaxe Head - * + * * @param stack * This item * @return Proper material ID. -1 for invalid */ - public int getMaterialID (ItemStack stack); + public int getMaterialID(ItemStack stack); } diff --git a/src/main/java/tconstruct/library/util/PiercingEntityDamage.java b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java index 153c65ed80e..f5e413f2067 100644 --- a/src/main/java/tconstruct/library/util/PiercingEntityDamage.java +++ b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java @@ -3,10 +3,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.EntityDamageSource; -public class PiercingEntityDamage extends EntityDamageSource -{ - public PiercingEntityDamage(String str, Entity entity) - { +public class PiercingEntityDamage extends EntityDamageSource { + public PiercingEntityDamage(String str, Entity entity) { super(str, entity); this.setDamageBypassesArmor(); } diff --git a/src/main/java/tconstruct/library/weaponry/AmmoItem.java b/src/main/java/tconstruct/library/weaponry/AmmoItem.java index 2a46f5ac928..aa6ca56fd05 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoItem.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoItem.java @@ -2,22 +2,16 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.StatCollector; -import tconstruct.library.TConstructRegistry; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.util.Reference; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; - -import java.util.List; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") @@ -30,14 +24,14 @@ public AmmoItem(int baseDamage, String name) { @Override public int getAmmoCount(ItemStack stack) { - if(!stack.hasTagCompound()) return 0; + if (!stack.hasTagCompound()) return 0; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); return tags.getInteger("Ammo"); } @Override public int getMaxAmmo(ItemStack stack) { - if(!stack.hasTagCompound()) return 0; + if (!stack.hasTagCompound()) return 0; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); return getMaxAmmo(tags); } @@ -50,7 +44,7 @@ public int getMaxAmmo(NBTTagCompound tags) { @Override public int addAmmo(int toAdd, ItemStack stack) { - if(!stack.hasTagCompound()) return toAdd; + if (!stack.hasTagCompound()) return toAdd; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); int oldCount = tags.getInteger("Ammo"); int newCount = Math.min(oldCount + toAdd, getMaxAmmo(stack)); @@ -60,7 +54,7 @@ public int addAmmo(int toAdd, ItemStack stack) { @Override public int consumeAmmo(int toUse, ItemStack stack) { - if(!stack.hasTagCompound()) return toUse; + if (!stack.hasTagCompound()) return toUse; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); int oldCount = tags.getInteger("Ammo"); int newCount = Math.max(oldCount - toUse, 0); @@ -70,42 +64,39 @@ public int consumeAmmo(int toUse, ItemStack stack) { @Override public void setAmmo(int count, ItemStack stack) { - if(!stack.hasTagCompound()) return; + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); tags.setInteger("Ammo", count); } - public float getAmmoModifier() { return 0.1f; } + public float getAmmoModifier() { + return 0.1f; + } - public boolean pickupAmmo(ItemStack stack, ItemStack candidate, EntityPlayer player) - { - if(stack.getItem() == null || !stack.hasTagCompound() || !(stack.getItem() instanceof IAmmo)) - return false; + public boolean pickupAmmo(ItemStack stack, ItemStack candidate, EntityPlayer player) { + if (stack.getItem() == null || !stack.hasTagCompound() || !(stack.getItem() instanceof IAmmo)) return false; // check if our candidate fits - if(candidate != null) - { + if (candidate != null) { // same item - if(testIfAmmoMatches(stack, candidate)) { + if (testIfAmmoMatches(stack, candidate)) { IAmmo pickedup = ((IAmmo) stack.getItem()); IAmmo ininventory = ((IAmmo) candidate.getItem()); // we can be sure that it's ammo, since stack is ammo and they're equal int count = pickedup.getAmmoCount(stack); - if(count != ininventory.addAmmo(count, candidate)) - return true; + if (count != ininventory.addAmmo(count, candidate)) return true; } } // search the players inventory - for(ItemStack invItem : player.inventory.mainInventory) { + for (ItemStack invItem : player.inventory.mainInventory) { if (testIfAmmoMatches(stack, invItem)) { IAmmo pickedup = ((IAmmo) stack.getItem()); IAmmo ininventory = ((IAmmo) invItem.getItem()); // we can be sure that it's ammo, since stack is ammo and they're equal int count = pickedup.getAmmoCount(stack); - if(count != ininventory.addAmmo(count, invItem)) - return true; + if (count != ininventory.addAmmo(count, invItem)) return true; } } @@ -113,15 +104,11 @@ public boolean pickupAmmo(ItemStack stack, ItemStack candidate, EntityPlayer pla return false; } - private boolean testIfAmmoMatches(ItemStack reference, ItemStack candidate) - { - if(candidate == null) - return false; - if(!candidate.hasTagCompound() || !candidate.getTagCompound().hasKey("InfiTool")) - return false; + private boolean testIfAmmoMatches(ItemStack reference, ItemStack candidate) { + if (candidate == null) return false; + if (!candidate.hasTagCompound() || !candidate.getTagCompound().hasKey("InfiTool")) return false; - if(reference.getItem() != candidate.getItem()) - return false; + if (reference.getItem() != candidate.getItem()) return false; NBTTagCompound referenceTags = getComparisonTags(reference); NBTTagCompound testTags = getComparisonTags(candidate); @@ -151,22 +138,18 @@ private NBTTagCompound getComparisonTags(ItemStack stack) { } private void copyTag(NBTTagCompound out, NBTTagCompound in, String tag) { - if(in.hasKey(tag)) - out.setInteger(tag, in.getInteger(tag)); + if (in.hasKey(tag)) out.setInteger(tag, in.getInteger(tag)); } - @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) - { + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { // ammo doesn't hurt on smacking stuff with it return false; } @Override @Optional.Method(modid = "battlegear2") - public boolean sheatheOnBack(ItemStack item) - { + public boolean sheatheOnBack(ItemStack item) { return true; } @@ -178,7 +161,8 @@ public boolean isOffhandHandDual(ItemStack off) { @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity( + PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { event.cancelParent = false; event.swingOffhand = false; event.shouldAttack = false; @@ -195,7 +179,7 @@ public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem @Override @Optional.Method(modid = "battlegear2") public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) { - event.setCanceled(false); + event.setCanceled(false); return false; } @@ -208,9 +192,10 @@ public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, It @Override @Optional.Method(modid = "battlegear2") public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { - if(offhand == null) - return true; - return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe) + if (offhand == null) return true; + return (mainhand != null + && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } } diff --git a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java index 2981b93de8f..3fa5dbe7f89 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java @@ -1,18 +1,19 @@ package tconstruct.library.weaponry; import cpw.mods.fml.common.Optional; -import tconstruct.weaponry.client.CrosshairType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.tools.TinkerTools; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import tconstruct.tools.TinkerTools; +import tconstruct.weaponry.client.CrosshairType; + @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) @@ -36,16 +37,23 @@ public int getMaxItemUseDuration(ItemStack par1ItemStack) { } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { - if(getAmmoCount(stack) > 0) - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (getAmmoCount(stack) > 0) player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); return stack; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float clickX, + float clickY, + float clickZ) { return false; } @@ -53,43 +61,43 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int * How long it takes to "ready" the weapon. To reach the point, where holding the right mouse button any longer doesn't have an impact. */ @Override - public int getWindupTime(ItemStack itemStack) { return 0; } + public int getWindupTime(ItemStack itemStack) { + return 0; + } @Override public float getMinWindupProgress(ItemStack itemStack) { return 0; } - public float getWindupProgress(ItemStack itemStack, int timeInUse) - { + public float getWindupProgress(ItemStack itemStack, int timeInUse) { float time = (float) timeInUse; float windup = getWindupTime(itemStack); - if(time > windup) - time = windup; + if (time > windup) time = windup; - return time/windup; + return time / windup; } + public float minAccuracy(ItemStack itemStack) { + return 0.5f; + } - public float minAccuracy(ItemStack itemStack) { return 0.5f; } - public float maxAccuracy(ItemStack itemStack) { return 0.5f; } + public float maxAccuracy(ItemStack itemStack) { + return 0.5f; + } @SideOnly(Side.CLIENT) - public float getWindupProgress(ItemStack itemStack, EntityPlayer player) - { + public float getWindupProgress(ItemStack itemStack, EntityPlayer player) { // what are you doing! - if(player.inventory.getCurrentItem() != itemStack) - return 0f; + if (player.inventory.getCurrentItem() != itemStack) return 0f; // are we using it? - if(player.getItemInUse() == null) - return 0f; + if (player.getItemInUse() == null) return 0f; - return getWindupProgress(itemStack, getMaxItemUseDuration(itemStack) - player.getItemInUseCount()); + return getWindupProgress(itemStack, getMaxItemUseDuration(itemStack) - player.getItemInUseCount()); } - public float getAccuracy(ItemStack itemStack, int time) - { + public float getAccuracy(ItemStack itemStack, int time) { float dif = minAccuracy(itemStack) - maxAccuracy(itemStack); return minAccuracy(itemStack) - dif * getWindupProgress(itemStack, time); @@ -103,34 +111,35 @@ public String[] getTraits() { @Override public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int durationLeft) { int time = this.getMaxItemUseDuration(stack) - durationLeft; - if(getWindupProgress(stack, time) >= getMinWindupProgress(stack)) - launchProjectile(stack, world, player, time); + if (getWindupProgress(stack, time) >= getMinWindupProgress(stack)) launchProjectile(stack, world, player, time); } protected void launchProjectile(ItemStack stack, World world, EntityPlayer player, int time) { // spawn projectile on server - if(!world.isRemote) { + if (!world.isRemote) { ItemStack reference = stack.copy(); reference.stackSize = 1; - ((IAmmo)reference.getItem()).setAmmo(1, reference); + ((IAmmo) reference.getItem()).setAmmo(1, reference); Entity projectile = createProjectile(reference, world, player, getAccuracy(stack, time), time); world.spawnEntityInWorld(projectile); } // reduce ammo - if(!player.capabilities.isCreativeMode) - this.consumeAmmo(1, stack); + if (!player.capabilities.isCreativeMode) this.consumeAmmo(1, stack); } - protected abstract Entity createProjectile(ItemStack reference, World world, EntityPlayer player, float accuracy, int time); + protected abstract Entity createProjectile( + ItemStack reference, World world, EntityPlayer player, float accuracy, int time); /** used for displaying the damage, return the value used for pseed in createProjectile/ProjectileBase constructor */ public abstract float getProjectileSpeed(); @SideOnly(Side.CLIENT) - public CrosshairType getCrosshairType() { return CrosshairType.SQUARE; } + public CrosshairType getCrosshairType() { + return CrosshairType.SQUARE; + } @Override public boolean zoomOnWindup(ItemStack itemStack) { @@ -146,8 +155,7 @@ public float getZoom(ItemStack itemStack) { @Override @Optional.Method(modid = "battlegear2") - public boolean sheatheOnBack(ItemStack item) - { + public boolean sheatheOnBack(ItemStack item) { return true; } @@ -159,7 +167,8 @@ public boolean isOffhandHandDual(ItemStack off) { @Override @Optional.Method(modid = "battlegear2") - public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { + public boolean offhandAttackEntity( + PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) { return true; } @@ -185,9 +194,10 @@ public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, It @Override @Optional.Method(modid = "battlegear2") public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { - if(offhand == null) - return true; - return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe) + if (offhand == null) return true; + return (mainhand != null + && mainhand.getItem() != TinkerTools.cleaver + && mainhand.getItem() != TinkerTools.battleaxe) && (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe); } } diff --git a/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java b/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java index b83da4a9b98..b416f0fd7b3 100644 --- a/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java +++ b/src/main/java/tconstruct/library/weaponry/ArrowShaftMaterial.java @@ -1,29 +1,45 @@ package tconstruct.library.weaponry; -import tconstruct.weaponry.TinkerWeaponry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.library.tools.CustomMaterial; +import tconstruct.weaponry.TinkerWeaponry; public class ArrowShaftMaterial extends CustomMaterial { public final float durabilityModifier; // like the durability modifier of handles, but for arrows! public final float fragility; // 1.0 = breaks 100%, 0.0 = never breaks public final float weight; // baseline: 1.0 = default, smaller = lighter, higher = heavier - public ArrowShaftMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durabilityModifier, float weight, float fragility, int color) { + public ArrowShaftMaterial( + int materialID, + int value, + ItemStack input, + ItemStack craftingItem, + float durabilityModifier, + float weight, + float fragility, + int color) { super(materialID, value, input, craftingItem, color); this.durabilityModifier = durabilityModifier; this.fragility = fragility; this.weight = weight; } - public static ArrowShaftMaterial createMaterial(int id, Item input, float durabilityModifier, float weight, float fragility, int color) - { + public static ArrowShaftMaterial createMaterial( + int id, Item input, float durabilityModifier, float weight, float fragility, int color) { return createMaterial(id, input, 0, durabilityModifier, weight, fragility, color); } - public static ArrowShaftMaterial createMaterial(int id, Item input, int inputMeta, float durabilityModifier, float weight, float fragility, int color) - { - return new ArrowShaftMaterial(id, 2, new ItemStack(input, 1, inputMeta), new ItemStack(TinkerWeaponry.partArrowShaft, 0, id), durabilityModifier, weight, fragility, color); + public static ArrowShaftMaterial createMaterial( + int id, Item input, int inputMeta, float durabilityModifier, float weight, float fragility, int color) { + return new ArrowShaftMaterial( + id, + 2, + new ItemStack(input, 1, inputMeta), + new ItemStack(TinkerWeaponry.partArrowShaft, 0, id), + durabilityModifier, + weight, + fragility, + color); } } diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java index f9c2b2eaf25..2d1a6d41f37 100644 --- a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java +++ b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java @@ -1,10 +1,8 @@ package tconstruct.library.weaponry; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.BowstringMaterial; -import tconstruct.library.tools.CustomMaterial; -import tconstruct.weaponry.ammo.ArrowAmmo; -import tconstruct.weaponry.entity.ArrowEntity; +import cpw.mods.fml.common.Loader; +import java.util.List; +import mods.battlegear2.api.core.InventoryPlayerBattle; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -14,11 +12,12 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; -import cpw.mods.fml.common.Loader; -import mods.battlegear2.api.core.InventoryPlayerBattle; - -import java.util.List; +import tconstruct.library.tools.BowstringMaterial; +import tconstruct.library.tools.CustomMaterial; +import tconstruct.weaponry.ammo.ArrowAmmo; +import tconstruct.weaponry.entity.ArrowEntity; public abstract class BowBaseAmmo extends ProjectileWeapon { public BowBaseAmmo(int baseDamage, String name) { @@ -56,13 +55,11 @@ public float getProjectileSpeed(ItemStack itemStack) { } @Override - public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) - { + public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) { // arrow priority: hotbar > inventory, tinker arrows > regular arrows - if(Loader.isModLoaded("battlegear2")){ + if (Loader.isModLoaded("battlegear2")) { ItemStack offhand = ((InventoryPlayerBattle) player.inventory).getCurrentOffhandWeapon(); - if(offhand != null && (checkTinkerArrow(offhand) || checkVanillaArrow(offhand))) - { + if (offhand != null && (checkTinkerArrow(offhand) || checkVanillaArrow(offhand))) { return offhand; } } @@ -70,103 +67,90 @@ public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) ItemStack[] inventory = player.inventory.mainInventory; // check hotbar for tinker arrows - for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) - if(checkTinkerArrow(inventory[i])) - return inventory[i]; + for (int i = 0; i < InventoryPlayer.getHotbarSize(); i++) + if (checkTinkerArrow(inventory[i])) return inventory[i]; // check hotbar for vanilla arrows - for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) - if(checkVanillaArrow(inventory[i])) - return inventory[i]; + for (int i = 0; i < InventoryPlayer.getHotbarSize(); i++) + if (checkVanillaArrow(inventory[i])) return inventory[i]; // check the rest of the inventory for tinker arrows - for(int i = InventoryPlayer.getHotbarSize(); i < inventory.length; i++) - if(checkTinkerArrow(inventory[i])) - return inventory[i]; + for (int i = InventoryPlayer.getHotbarSize(); i < inventory.length; i++) + if (checkTinkerArrow(inventory[i])) return inventory[i]; // check the rest of the inventory for vanilla arrows - for(int i = InventoryPlayer.getHotbarSize(); i < inventory.length; i++) - if(checkVanillaArrow(inventory[i])) - return inventory[i]; + for (int i = InventoryPlayer.getHotbarSize(); i < inventory.length; i++) + if (checkVanillaArrow(inventory[i])) return inventory[i]; // creative mode - if(player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, weapon) > 0) + if (player.capabilities.isCreativeMode + || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, weapon) > 0) return new ItemStack(Items.arrow); return null; } - private boolean checkTinkerArrow(ItemStack stack) - { + private boolean checkTinkerArrow(ItemStack stack) { // null - if(stack == null) - return false; + if (stack == null) return false; // no tinker arrow - if(!(stack.getItem() instanceof ArrowAmmo)) - return false; + if (!(stack.getItem() instanceof ArrowAmmo)) return false; // no ammo left - if(((IAmmo) stack.getItem()).getAmmoCount(stack) <= 0) - return false; + if (((IAmmo) stack.getItem()).getAmmoCount(stack) <= 0) return false; return true; } - private boolean checkVanillaArrow(ItemStack stack) - { + private boolean checkVanillaArrow(ItemStack stack) { // null - if(stack == null) - return false; + if (stack == null) return false; // no arrow - if(!(stack.getItem() == Items.arrow)) - return false; + if (!(stack.getItem() == Items.arrow)) return false; // inventory shouldn't contain stacksize 0 items so we don't have to check that. return true; } @Override - protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { + protected Entity createProjectile( + ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { EntityArrow arrow; - if(arrows.getItem() == Items.arrow) { - arrow = new EntityArrow(world, player, speed/1.5f); // vanilla arrows internally do x1.5 - } - else { + if (arrows.getItem() == Items.arrow) { + arrow = new EntityArrow(world, player, speed / 1.5f); // vanilla arrows internally do x1.5 + } else { ItemStack reference = arrows.copy(); reference.stackSize = 1; reference.getTagCompound().getCompoundTag("InfiTool").setInteger("Ammo", 1); arrow = new ArrowEntity(world, player, speed, accuracy, reference); } - if(player.capabilities.isCreativeMode) - arrow.canBePickedUp = 2; + if (player.capabilities.isCreativeMode) arrow.canBePickedUp = 2; - if(windup >= 1f) - arrow.setIsCritical(true); + if (windup >= 1f) arrow.setIsCritical(true); return arrow; } @Override - public void playFiringSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy) { + public void playFiringSound( + World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy) { world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speed * 0.5F); } @Override - public void buildTool (int id, String name, List list) - { + public void buildTool(int id, String name, List list) { // does the material have a bow material? - if(TConstructRegistry.getBowMaterial(id) == null) - return; + if (TConstructRegistry.getBowMaterial(id) == null) return; // all creative bows use regular bowstring ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // regular bowstring ItemStack accessoryStack = getPartAmount() > 2 ? new ItemStack(getAccessoryItem(), 1, id) : null; ItemStack extraStack = getPartAmount() > 3 ? new ItemStack(getExtraItem(), 1, id) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, extraStack, ""); - if (tool != null) - { + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, extraStack, ""); + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); } diff --git a/src/main/java/tconstruct/library/weaponry/IAccuracy.java b/src/main/java/tconstruct/library/weaponry/IAccuracy.java index 764ce990f26..c2d30033802 100644 --- a/src/main/java/tconstruct/library/weaponry/IAccuracy.java +++ b/src/main/java/tconstruct/library/weaponry/IAccuracy.java @@ -1,10 +1,11 @@ package tconstruct.library.weaponry; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public interface IAccuracy { public float minAccuracy(ItemStack itemStack); + public float maxAccuracy(ItemStack itemStack); + public float getAccuracy(ItemStack itemStack, int time); } diff --git a/src/main/java/tconstruct/library/weaponry/IWindup.java b/src/main/java/tconstruct/library/weaponry/IWindup.java index 31a6ae23ab3..a4b91b3d8b4 100644 --- a/src/main/java/tconstruct/library/weaponry/IWindup.java +++ b/src/main/java/tconstruct/library/weaponry/IWindup.java @@ -1,8 +1,8 @@ package tconstruct.library.weaponry; -import tconstruct.weaponry.client.CrosshairType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import tconstruct.weaponry.client.CrosshairType; /** * This class has a windup time, meaning it takes some time to reach full potency. @@ -10,11 +10,14 @@ */ public interface IWindup { public int getWindupTime(ItemStack itemStack); // how long it takes to fully wind up + public float getWindupProgress(ItemStack itemStack, EntityPlayer player); // how far we've winded up, 0.0-1.0 + public float getMinWindupProgress(ItemStack itemStack); // how long it has been winded up at least to fire (0.0-1.0) public CrosshairType getCrosshairType(); public boolean zoomOnWindup(ItemStack itemStack); + public float getZoom(ItemStack itemStack); } diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java index 0b6383bdffa..fda662c12bd 100644 --- a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java @@ -1,9 +1,11 @@ package tconstruct.library.weaponry; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.HashMap; import java.util.List; import java.util.Map; - import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; import net.minecraft.client.renderer.texture.IIconRegister; @@ -27,9 +29,6 @@ import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") @@ -76,20 +75,19 @@ public float getZoom(ItemStack itemStack) { * @param accuracy the accuracy calculated for the projectile * @return A banana. */ - protected abstract Entity createProjectile(ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, float windup); - + protected abstract Entity createProjectile( + ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, float windup); /* Accuracy */ public abstract float minAccuracy(ItemStack itemStack); + public abstract float maxAccuracy(ItemStack itemStack); - public float getAccuracy(ItemStack itemStack, EntityPlayer player) - { - return getAccuracy(itemStack, getMaxItemUseDuration(itemStack) - player.getItemInUseCount()); + public float getAccuracy(ItemStack itemStack, EntityPlayer player) { + return getAccuracy(itemStack, getMaxItemUseDuration(itemStack) - player.getItemInUseCount()); } - public float getAccuracy(ItemStack itemStack, int time) - { + public float getAccuracy(ItemStack itemStack, int time) { float dif = minAccuracy(itemStack) - maxAccuracy(itemStack); return minAccuracy(itemStack) - dif * getWindupProgress(itemStack, time); @@ -97,40 +95,32 @@ public float getAccuracy(ItemStack itemStack, int time) /* Windup */ public int getWindupTime(ItemStack itemStack) { - if(itemStack == null || !itemStack.hasTagCompound()) - return 1; - + if (itemStack == null || !itemStack.hasTagCompound()) return 1; + NBTTagCompound toolTag = itemStack.getTagCompound().getCompoundTag("InfiTool"); return toolTag.getInteger("DrawSpeed"); } - public float getWindupProgress(ItemStack itemStack, EntityPlayer player) - { + public float getWindupProgress(ItemStack itemStack, EntityPlayer player) { // what are you doing! - if(player.inventory.getCurrentItem() != itemStack) - return 0f; + if (player.inventory.getCurrentItem() != itemStack) return 0f; // are we using it? - if(player.getItemInUse() == null) - return 0f; + if (player.getItemInUse() == null) return 0f; - return getWindupProgress(itemStack, getMaxItemUseDuration(itemStack) - player.getItemInUseCount()); + return getWindupProgress(itemStack, getMaxItemUseDuration(itemStack) - player.getItemInUseCount()); } - public float getWindupProgress(ItemStack itemStack, int timeInUse) - { + public float getWindupProgress(ItemStack itemStack, int timeInUse) { float time = (float) timeInUse; float windup = getWindupTime(itemStack); - if(time > windup) - return 1.0f; + if (time > windup) return 1.0f; - return time/windup; + return time / windup; } - public float getProjectileSpeed(ItemStack itemStack) - { - if (itemStack != null && itemStack.hasTagCompound()) - { + public float getProjectileSpeed(ItemStack itemStack) { + if (itemStack != null && itemStack.hasTagCompound()) { NBTTagCompound toolTag = itemStack.getTagCompound().getCompoundTag("InfiTool"); return toolTag.getFloat("FlightSpeed"); } @@ -149,26 +139,22 @@ public int getMaxItemUseDuration(ItemStack par1ItemStack) { } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { - if(getWindupTime(stack) == 0.0f) - return stack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (getWindupTime(stack) == 0.0f) return stack; // broken tool? - if(stack.hasTagCompound() && stack.getTagCompound().hasKey(getBaseTagName()) && stack.getTagCompound().getCompoundTag(getBaseTagName()).getBoolean("Broken")) - return stack; + if (stack.hasTagCompound() + && stack.getTagCompound().hasKey(getBaseTagName()) + && stack.getTagCompound().getCompoundTag(getBaseTagName()).getBoolean("Broken")) return stack; // only if ammo is present - if(searchForAmmo(player, stack) != null) - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + if (searchForAmmo(player, stack) != null) player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); return stack; } @Override - public void onPlayerStoppedUsing (ItemStack weapon, World world, EntityPlayer player, int useRemaining) - { - if (!weapon.hasTagCompound()) - { + public void onPlayerStoppedUsing(ItemStack weapon, World world, EntityPlayer player, int useRemaining) { + if (!weapon.hasTagCompound()) { return; } @@ -177,8 +163,7 @@ public void onPlayerStoppedUsing (ItemStack weapon, World world, EntityPlayer pl // we abuse the arrowLooseEvent for all projectiles ArrowLooseEvent event = new ArrowLooseEvent(player, weapon, time); MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - { + if (event.isCanceled()) { return; } time = event.charge; @@ -187,8 +172,7 @@ public void onPlayerStoppedUsing (ItemStack weapon, World world, EntityPlayer pl ItemStack ammo = searchForAmmo(player, weapon); // no ammo found. :( - if(ammo == null) - return; + if (ammo == null) return; NBTTagCompound toolTag = weapon.getTagCompound().getCompoundTag("InfiTool"); float projectileSpeed = getProjectileSpeed(weapon); @@ -196,39 +180,32 @@ public void onPlayerStoppedUsing (ItemStack weapon, World world, EntityPlayer pl float accuracy = getAccuracy(weapon, time); // needs a minimum windup - if(windup < this.getMinWindupProgress(weapon)) - return; + if (windup < this.getMinWindupProgress(weapon)) return; // take windup time into account projectileSpeed *= windup; Entity projectile = createProjectile(ammo, world, player, projectileSpeed, accuracy, windup); - int reinforced = 0; - if (toolTag.hasKey("Unbreaking")) - reinforced = toolTag.getInteger("Unbreaking"); + if (toolTag.hasKey("Unbreaking")) reinforced = toolTag.getInteger("Unbreaking"); - if (random.nextInt(10) < 10 - reinforced) - AbilityHelper.damageTool(weapon, 1, player, false); + if (random.nextInt(10) < 10 - reinforced) AbilityHelper.damageTool(weapon, 1, player, false); playFiringSound(world, player, weapon, ammo, projectileSpeed, accuracy); - // use up ammo - if(!player.capabilities.isCreativeMode) { - if (ammo.getItem() instanceof IAmmo) - ((IAmmo) ammo.getItem()).consumeAmmo(1, ammo); - else - player.inventory.consumeInventoryItem(ammo.getItem()); + if (!player.capabilities.isCreativeMode) { + if (ammo.getItem() instanceof IAmmo) ((IAmmo) ammo.getItem()).consumeAmmo(1, ammo); + else player.inventory.consumeInventoryItem(ammo.getItem()); } // FIREEEEEEE - if (!world.isRemote) - world.spawnEntityInWorld(projectile); + if (!world.isRemote) world.spawnEntityInWorld(projectile); } - public abstract void playFiringSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy); + public abstract void playFiringSound( + World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy); public HashMap animationHeadIcons = new HashMap(); public HashMap animationHandleIcons = new HashMap(); @@ -243,8 +220,7 @@ public void onPlayerStoppedUsing (ItemStack weapon, World world, EntityPlayer pl * 2 == accessory * 3 == extra */ - protected boolean animateLayer(int renderPass) - { + protected boolean animateLayer(int renderPass) { return false; } @@ -252,20 +228,21 @@ protected boolean animateLayer(int renderPass) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { NBTTagCompound tags = null; - if(stack.hasTagCompound()) - tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (stack.hasTagCompound()) tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if(tags == null || renderPass > 10) - return super.getIcon(stack, renderPass, player, usingItem, useRemaining); + if (tags == null || renderPass > 10) return super.getIcon(stack, renderPass, player, usingItem, useRemaining); // are we drawing an effect? - if(renderPass >= getPartAmount()) { + if (renderPass >= getPartAmount()) { // is the effect animated? String effect = "Effect" + (1 + renderPass - getPartAmount()); - if(tags.hasKey(effect)) { + if (tags.hasKey(effect)) { int index = tags.getInteger(effect); - if(animationEffectIcons.get(index) != null) - return getCorrectAnimationIcon(animationEffectIcons, index, getWindupProgress(usingItem, getMaxItemUseDuration(usingItem) - useRemaining)); + if (animationEffectIcons.get(index) != null) + return getCorrectAnimationIcon( + animationEffectIcons, + index, + getWindupProgress(usingItem, getMaxItemUseDuration(usingItem) - useRemaining)); else // non-animated return effectIcons.get(index); @@ -274,35 +251,35 @@ public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemS } // animate? - if(!animateLayer(renderPass)) - return super.getIcon(stack, renderPass, player, usingItem, useRemaining); + if (!animateLayer(renderPass)) return super.getIcon(stack, renderPass, player, usingItem, useRemaining); - if(usingItem == null || stack != usingItem || !stack.hasTagCompound()) + if (usingItem == null || stack != usingItem || !stack.hasTagCompound()) return super.getIcon(stack, renderPass, player, usingItem, useRemaining); float progress = getWindupProgress(usingItem, getMaxItemUseDuration(usingItem) - useRemaining); // get the correct icon - switch (renderPass) - { - case 0: return getCorrectAnimationIcon(animationHandleIcons, tags.getInteger("RenderHandle"), progress); - case 1: return getCorrectAnimationIcon(animationHeadIcons, tags.getInteger("RenderHead"), progress); - case 2: return getCorrectAnimationIcon(animationAccessoryIcons, tags.getInteger("RenderAccessory"), progress); - case 3: return getCorrectAnimationIcon(animationExtraIcons, tags.getInteger("RenderExtra"), progress); + switch (renderPass) { + case 0: + return getCorrectAnimationIcon(animationHandleIcons, tags.getInteger("RenderHandle"), progress); + case 1: + return getCorrectAnimationIcon(animationHeadIcons, tags.getInteger("RenderHead"), progress); + case 2: + return getCorrectAnimationIcon(animationAccessoryIcons, tags.getInteger("RenderAccessory"), progress); + case 3: + return getCorrectAnimationIcon(animationExtraIcons, tags.getInteger("RenderExtra"), progress); } return emptyIcon; } - protected IIcon getCorrectAnimationIcon(Map icons, int id, float progress) - { + protected IIcon getCorrectAnimationIcon(Map icons, int id, float progress) { // animation count, standard texture as reference float count = icons.get(-1).length - 1; int step = Math.round(progress * count); step = Math.max(0, step); - if(icons.containsKey(id)) - return icons.get(id)[step]; + if (icons.containsKey(id)) return icons.get(id)[step]; // default icon return icons.get(-1)[step]; @@ -311,40 +288,30 @@ protected IIcon getCorrectAnimationIcon(Map icons, int id, flo @Override @SideOnly(Side.CLIENT) // exactly the same as the ToolCore one but with broken check for Handle instead of Head - public IIcon getIcon (ItemStack stack, int renderPass) - { + public IIcon getIcon(ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound(); - if (tags != null) - { + if (tags != null) { tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (renderPass < getPartAmount()) - { + if (renderPass < getPartAmount()) { // Handle if (renderPass == 0) { - if (tags.getBoolean("Broken")) - return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle")); - else - return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle")); + if (tags.getBoolean("Broken")) return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle")); + else return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle")); } - // Head - else if (renderPass == 1) - { + // Head + else if (renderPass == 1) { return getCorrectIcon(headIcons, tags.getInteger("RenderHead")); } // Accessory - else if (renderPass == 2) - return getCorrectIcon(accessoryIcons, tags.getInteger("RenderAccessory")); - // Extra - else if (renderPass == 3) - return getCorrectIcon(extraIcons, tags.getInteger("RenderExtra")); + else if (renderPass == 2) return getCorrectIcon(accessoryIcons, tags.getInteger("RenderAccessory")); + // Extra + else if (renderPass == 3) return getCorrectIcon(extraIcons, tags.getInteger("RenderExtra")); } // Effects - else if (renderPass <= 10) - { + else if (renderPass <= 10) { String effect = "Effect" + (1 + renderPass - getPartAmount()); - if(tags.hasKey(effect)) - return effectIcons.get(tags.getInteger(effect)); + if (tags.hasKey(effect)) return effectIcons.get(tags.getInteger(effect)); } return blankSprite; } @@ -363,73 +330,63 @@ public void registerIcons(IIconRegister iconRegister) { // animated effects... // find out the longest animation int count = 0; - if(animationHeadIcons.get(-1) != null) - count = Math.max(count, animationHeadIcons.get(-1).length); - if(animationHandleIcons.get(-1) != null) - count = Math.max(count, animationHandleIcons.get(-1).length); - if(animationAccessoryIcons.get(-1) != null) - count = Math.max(count, animationAccessoryIcons.get(-1).length); - if(animationExtraIcons.get(-1) != null) - count = Math.max(count, animationExtraIcons.get(-1).length); - - - for(Map.Entry entry : effectStrings.entrySet()) - { + if (animationHeadIcons.get(-1) != null) count = Math.max(count, animationHeadIcons.get(-1).length); + if (animationHandleIcons.get(-1) != null) count = Math.max(count, animationHandleIcons.get(-1).length); + if (animationAccessoryIcons.get(-1) != null) count = Math.max(count, animationAccessoryIcons.get(-1).length); + if (animationExtraIcons.get(-1) != null) count = Math.max(count, animationExtraIcons.get(-1).length); + + for (Map.Entry entry : effectStrings.entrySet()) { IIcon[] anims = new IIcon[count]; boolean empty = true; - for(int i = 0; i < count; i++) { - String tex = entry.getValue() + "_" + (i+1); + for (int i = 0; i < count; i++) { + String tex = entry.getValue() + "_" + (i + 1); if (TextureHelper.itemTextureExists(tex)) { anims[i] = iconRegister.registerIcon(tex); empty = false; } } - if(!empty) - animationEffectIcons.put(entry.getKey(), anims); + if (!empty) animationEffectIcons.put(entry.getKey(), anims); } // default for effects is blank IIcon[] anims = new IIcon[count]; - for(int i = 0; i < count; i++) - anims[i] = blankSprite; + for (int i = 0; i < count; i++) anims[i] = blankSprite; animationEffectIcons.put(-1, anims); } - private void addAnimationIcons(HashMap textures, HashMap icons, IIconRegister iconRegister, String standard) - { + private void addAnimationIcons( + HashMap textures, + HashMap icons, + IIconRegister iconRegister, + String standard) { icons.clear(); // we use the standard to determine how many animations there are - if(standard == null || standard.isEmpty()) - return; + if (standard == null || standard.isEmpty()) return; int count = 1; - standard = getDefaultTexturePath() + "/" + standard; - while(TextureHelper.itemTextureExists(standard + "_" + count)) - count++; + standard = getDefaultTexturePath() + "/" + standard; + while (TextureHelper.itemTextureExists(standard + "_" + count)) count++; count--; // add the standard icons IIcon[] anims = new IIcon[count]; - for(int i = 0; i < count; i++) - anims[i] = iconRegister.registerIcon(standard + "_" + (i+1)); + for (int i = 0; i < count; i++) anims[i] = iconRegister.registerIcon(standard + "_" + (i + 1)); icons.put(-1, anims); // now do the same for each entry - for(Map.Entry entry : textures.entrySet()) - { + for (Map.Entry entry : textures.entrySet()) { anims = new IIcon[count]; boolean empty = true; - for(int i = 0; i < count; i++) { - String tex = entry.getValue() + "_" + (i+1); + for (int i = 0; i < count; i++) { + String tex = entry.getValue() + "_" + (i + 1); if (TextureHelper.itemTextureExists(tex)) { anims[i] = iconRegister.registerIcon(tex); empty = false; } } - if(!empty) - icons.put(entry.getKey(), anims); + if (!empty) icons.put(entry.getKey(), anims); } } @@ -438,29 +395,25 @@ private void addAnimationIcons(HashMap textures, HashMap 0) - { + if (itemstack != null) { + while (itemstack.stackSize > 0) { int ss = itemstack.stackSize; itemstack.stackSize -= ss; - EntityItem entityitem = new EntityItem(par1World, (double) ((float) par2), (double) ((float) par3), (double) ((float) par4), new ItemStack(itemstack.getItem(), ss, itemstack.getItemDamage())); - - if (itemstack.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + EntityItem entityitem = new EntityItem( + par1World, + (double) ((float) par2), + (double) ((float) par3), + (double) ((float) par4), + new ItemStack(itemstack.getItem(), ss, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) + itemstack.getTagCompound().copy()); } float f3 = 0.05F; @@ -189,9 +181,7 @@ public void breakBlock (World par1World, int par2, int par3, int par4, Block par } WorldHelper.setBlockToAir(par1World, par2, par3, par4); - } - else if (explodeOnBroken) - { + } else if (explodeOnBroken) { checkExplosion(par1World, par2, par3, par4, true); } @@ -199,8 +189,7 @@ else if (explodeOnBroken) } @Override - public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3List) - { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); par3List.add(new ItemStack(par1, 1, 1)); par3List.add(new ItemStack(par1, 1, 2)); @@ -208,58 +197,59 @@ public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3Lis } @Override - public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { + public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { return true; } @Override - public boolean canPlaceBlockOnSide (World par1World, int par2, int par3, int par4, int par5) - { + public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) { ForgeDirection dir = ForgeDirection.getOrientation(par5); - return (dir == DOWN && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) || (dir == UP && par1World.isSideSolid(par2, par3 - 1, par4, UP)) || (dir == NORTH && par1World.isSideSolid(par2, par3, par4 + 1, NORTH)) || (dir == SOUTH && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH)) || (dir == WEST && par1World.isSideSolid(par2 + 1, par3, par4, WEST)) || (dir == EAST && par1World.isSideSolid(par2 - 1, par3, par4, EAST)); + return (dir == DOWN && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) + || (dir == UP && par1World.isSideSolid(par2, par3 - 1, par4, UP)) + || (dir == NORTH && par1World.isSideSolid(par2, par3, par4 + 1, NORTH)) + || (dir == SOUTH && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH)) + || (dir == WEST && par1World.isSideSolid(par2 + 1, par3, par4, WEST)) + || (dir == EAST && par1World.isSideSolid(par2 - 1, par3, par4, EAST)); } @Override - public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) - { - return par1World.isSideSolid(par2 - 1, par3, par4, EAST) || par1World.isSideSolid(par2 + 1, par3, par4, WEST) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH) || par1World.isSideSolid(par2, par3 - 1, par4, UP) || par1World.isSideSolid(par2, par3 + 1, par4, DOWN); + public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { + return par1World.isSideSolid(par2 - 1, par3, par4, EAST) + || par1World.isSideSolid(par2 + 1, par3, par4, WEST) + || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) + || par1World.isSideSolid(par2, par3, par4 + 1, NORTH) + || par1World.isSideSolid(par2, par3 - 1, par4, UP) + || par1World.isSideSolid(par2, par3 + 1, par4, DOWN); } @Override - public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) - { + public int onBlockPlaced( + World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { int j1 = par9 & 8; int k1 = par9 & 7; byte b0 = -1; - if (par5 == 0 && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) - { + if (par5 == 0 && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) { b0 = 0; } - if (par5 == 1 && par1World.isSideSolid(par2, par3 - 1, par4, UP)) - { + if (par5 == 1 && par1World.isSideSolid(par2, par3 - 1, par4, UP)) { b0 = 5; } - if (par5 == 2 && par1World.isSideSolid(par2, par3, par4 + 1, NORTH)) - { + if (par5 == 2 && par1World.isSideSolid(par2, par3, par4 + 1, NORTH)) { b0 = 4; } - if (par5 == 3 && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH)) - { + if (par5 == 3 && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH)) { b0 = 3; } - if (par5 == 4 && par1World.isSideSolid(par2 + 1, par3, par4, WEST)) - { + if (par5 == 4 && par1World.isSideSolid(par2 + 1, par3, par4, WEST)) { b0 = 2; } - if (par5 == 5 && par1World.isSideSolid(par2 - 1, par3, par4, EAST)) - { + if (par5 == 5 && par1World.isSideSolid(par2 - 1, par3, par4, EAST)) { b0 = 1; } @@ -267,251 +257,220 @@ public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par } @Override - public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) - { + public void onBlockPlacedBy( + World par1World, + int par2, + int par3, + int par4, + EntityLivingBase par5EntityLivingBase, + ItemStack par6ItemStack) { int l = par1World.getBlockMetadata(par2, par3, par4); int i1 = l & 7; int j1 = l & 8; - if (i1 == invertMetadata(1)) - { - if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) == 0) - { + if (i1 == invertMetadata(1)) { + if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) + == 0) { par1World.setBlockMetadataWithNotify(par2, par3, par4, 5 | j1, 2); - } - else - { + } else { par1World.setBlockMetadataWithNotify(par2, par3, par4, 6 | j1, 2); } - } - else if (i1 == invertMetadata(0)) - { - if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) == 0) - { + } else if (i1 == invertMetadata(0)) { + if ((MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 1) + == 0) { par1World.setBlockMetadataWithNotify(par2, par3, par4, 7 | j1, 2); - } - else - { + } else { par1World.setBlockMetadataWithNotify(par2, par3, par4, 0 | j1, 2); } } - if (par6ItemStack.hasDisplayName()) - { - ((TileEntityLandmine) par1World.getTileEntity(par2, par3, par4)).setGuiDisplayName(par6ItemStack.getDisplayName()); + if (par6ItemStack.hasDisplayName()) { + ((TileEntityLandmine) par1World.getTileEntity(par2, par3, par4)) + .setGuiDisplayName(par6ItemStack.getDisplayName()); } } - public static int invertMetadata (int par0) - { - switch (par0) - { - case 0: - return 0; - case 1: - return 5; - case 2: - return 4; - case 3: - return 3; - case 4: - return 2; - case 5: - return 1; - default: - return -1; + public static int invertMetadata(int par0) { + switch (par0) { + case 0: + return 0; + case 1: + return 5; + case 2: + return 4; + case 3: + return 3; + case 4: + return 2; + case 5: + return 1; + default: + return -1; } } @Override - public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5Block) - { + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5Block) { checkPlacement(par1World, par2, par3, par4, par5Block); checkExplosion(par1World, par2, par3, par4, false); } - public void checkPlacement (World par1World, int par2, int par3, int par4, Block par5Block) - { - if (this.checkIfAttachedToBlock(par1World, par2, par3, par4)) - { + public void checkPlacement(World par1World, int par2, int par3, int par4, Block par5Block) { + if (this.checkIfAttachedToBlock(par1World, par2, par3, par4)) { int i1 = par1World.getBlockMetadata(par2, par3, par4) & 7; boolean flag = false; - if (!par1World.isSideSolid(par2 - 1, par3, par4, EAST) && i1 == 1) - { + if (!par1World.isSideSolid(par2 - 1, par3, par4, EAST) && i1 == 1) { flag = true; } - if (!par1World.isSideSolid(par2 + 1, par3, par4, WEST) && i1 == 2) - { + if (!par1World.isSideSolid(par2 + 1, par3, par4, WEST) && i1 == 2) { flag = true; } - if (!par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) && i1 == 3) - { + if (!par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) && i1 == 3) { flag = true; } - if (!par1World.isSideSolid(par2, par3, par4 + 1, NORTH) && i1 == 4) - { + if (!par1World.isSideSolid(par2, par3, par4 + 1, NORTH) && i1 == 4) { flag = true; } - if (!par1World.isSideSolid(par2, par3 - 1, par4, UP) && i1 == 5) - { + if (!par1World.isSideSolid(par2, par3 - 1, par4, UP) && i1 == 5) { flag = true; } - if (!par1World.isSideSolid(par2, par3 - 1, par4, UP) && i1 == 6) - { + if (!par1World.isSideSolid(par2, par3 - 1, par4, UP) && i1 == 6) { flag = true; } - if (!par1World.isSideSolid(par2, par3 + 1, par4, DOWN) && i1 == 0) - { + if (!par1World.isSideSolid(par2, par3 + 1, par4, DOWN) && i1 == 0) { flag = true; } - if (!par1World.isSideSolid(par2, par3 + 1, par4, DOWN) && i1 == 7) - { + if (!par1World.isSideSolid(par2, par3 + 1, par4, DOWN) && i1 == 7) { flag = true; } - if (flag) - { + if (flag) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } } - private boolean checkIfAttachedToBlock (World par1World, int par2, int par3, int par4) - { - if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) - { + private boolean checkIfAttachedToBlock(World par1World, int par2, int par3, int par4) { + if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); WorldHelper.setBlockToAir(par1World, par2, par3, par4); return false; - } - else - { + } else { return true; } } @Override - public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) - { - if (!par1World.isRemote) - { + public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { + if (!par1World.isRemote) { checkExplosion(par1World, par2, par3, par4, false); } } @Override - public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity) - { - if (!par1World.isRemote) - { + public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { + if (!par1World.isRemote) { this.checkExplosion(par1World, par2, par3, par4, false); } } - public void checkExplosion (World par1World, int par2, int par3, int par4, boolean skipCheck) - { - if (skipCheck || getMineState(par1World, par2, par3, par4) > 0) - { - if (hasItems(par1World, par2, par3, par4)) - { + public void checkExplosion(World par1World, int par2, int par3, int par4, boolean skipCheck) { + if (skipCheck || getMineState(par1World, par2, par3, par4) > 0) { + if (hasItems(par1World, par2, par3, par4)) { TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); - if (te.soundcountything <= 0) - { - par1World.playSoundEffect((double) par2 + 0.5D, (double) par3 + 0.1D, (double) par4 + 0.5D, "random.click", 0.3F, 0.6F); + if (te.soundcountything <= 0) { + par1World.playSoundEffect( + (double) par2 + 0.5D, + (double) par3 + 0.1D, + (double) par4 + 0.5D, + "random.click", + 0.3F, + 0.6F); te.setSoundPlayed(); } - new LandmineExplodeLogic(par1World, par2, par3, par4, getMineTriggerer(par1World, par2, par3, par4)).explode(); + new LandmineExplodeLogic(par1World, par2, par3, par4, getMineTriggerer(par1World, par2, par3, par4)) + .explode(); } } } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { return null; } - private boolean hasItems (World par1World, int par2, int par3, int par4) - { + private boolean hasItems(World par1World, int par2, int par3, int par4) { TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); - if (te != null && te.getStackInSlot(0) != null || te.getStackInSlot(1) != null || te.getStackInSlot(2) != null) - { + if (te != null && te.getStackInSlot(0) != null + || te.getStackInSlot(1) != null + || te.getStackInSlot(2) != null) { return true; - } - else - { + } else { return false; } } - protected int getMineState (World par1World, int par2, int par3, int par4) - { + protected int getMineState(World par1World, int par2, int par3, int par4) { TileEntity tileEntity = par1World.getTileEntity(par2, par3, par4); // Change to return 1 if you want the landmine to blow up when the block // holding it is broken - if (!(tileEntity instanceof TileEntityLandmine)) - { + if (!(tileEntity instanceof TileEntityLandmine)) { return 0; } - TileEntityLandmine te = (TileEntityLandmine)tileEntity; + TileEntityLandmine te = (TileEntityLandmine) tileEntity; Sensitivity triggerType; - switch (te.triggerType) - { - case 0: - triggerType = Sensitivity.everything; - break; - case 1: - triggerType = Sensitivity.mobs; - break; - case 2: - triggerType = Sensitivity.players; - break; - default: - triggerType = null; - break; - } - - if (triggerType != null) - { + switch (te.triggerType) { + case 0: + triggerType = Sensitivity.everything; + break; + case 1: + triggerType = Sensitivity.mobs; + break; + case 2: + triggerType = Sensitivity.players; + break; + default: + triggerType = null; + break; + } + + if (triggerType != null) { List list = null; - if (triggerType == Sensitivity.everything) - { - list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, getSensitiveAABB(par1World, par2, par3, par4)); + if (triggerType == Sensitivity.everything) { + list = par1World.getEntitiesWithinAABBExcludingEntity( + (Entity) null, getSensitiveAABB(par1World, par2, par3, par4)); } - if (triggerType == Sensitivity.mobs) - { - list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, getSensitiveAABB(par1World, par2, par3, par4)); + if (triggerType == Sensitivity.mobs) { + list = par1World.getEntitiesWithinAABB( + EntityLivingBase.class, getSensitiveAABB(par1World, par2, par3, par4)); } - if (triggerType == Sensitivity.players) - { - list = par1World.getEntitiesWithinAABB(EntityPlayer.class, this.getSensitiveAABB(par1World, par2, par3, par4)); + if (triggerType == Sensitivity.players) { + list = par1World.getEntitiesWithinAABB( + EntityPlayer.class, this.getSensitiveAABB(par1World, par2, par3, par4)); } - if (list != null && !list.isEmpty()) - { + if (list != null && !list.isEmpty()) { Iterator iterator = list.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); - if (!entity.doesEntityNotTriggerPressurePlate()) - { + if (!entity.doesEntityNotTriggerPressurePlate()) { return 1; } } @@ -521,8 +480,7 @@ protected int getMineState (World par1World, int par2, int par3, int par4) return par1World.isBlockIndirectlyGettingPowered(par2, par3, par4) ? 1 : 0; } - protected AxisAlignedBB getSensitiveAABB (World par1World, int par2, int par3, int par4) - { + protected AxisAlignedBB getSensitiveAABB(World par1World, int par2, int par3, int par4) { float f = 0.125F; // return AxisAlignedBB.getBoundingBox((double)((float)par1 + f), // (double)par2, (double)((float)par3 + f), (double)((float)(par1 + 1) - @@ -532,30 +490,33 @@ protected AxisAlignedBB getSensitiveAABB (World par1World, int par2, int par3, i int i1 = l & 7; boolean flag = (l & 8) > 0; - float minX = par2 + f, minY = par3, minZ = par4 + f, maxX = par2 + 1 - f, maxY = par3 + 0.25F, maxZ = par4 + 1 - f; + float minX = par2 + f, + minY = par3, + minZ = par4 + f, + maxX = par2 + 1 - f, + maxY = par3 + 0.25F, + maxZ = par4 + 1 - f; ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); - switch (dir) - { - case DOWN: - break; - case UP: - minY = par3 + 0.75F; - maxY = par3 + 1; - break; - default: - minX = par2; - minY = par3; - minZ = par4; - maxX = par2 + 1; - maxY = par3 + 1; - maxZ = par4 + 1; + switch (dir) { + case DOWN: + break; + case UP: + minY = par3 + 0.75F; + maxY = par3 + 1; + break; + default: + minX = par2; + minY = par3; + minZ = par4; + maxX = par2 + 1; + maxY = par3 + 1; + maxZ = par4 + 1; } return AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ); } - public Entity getMineTriggerer (World par1World, int par2, int par3, int par4) - { + public Entity getMineTriggerer(World par1World, int par2, int par3, int par4) { TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); @@ -563,55 +524,52 @@ public Entity getMineTriggerer (World par1World, int par2, int par3, int par4) // Change to return 1 if you want the landmine to blow up when the // block holding it is broken - if (te == null) - { + if (te == null) { return null; } - switch (te.triggerType) - { - case 0: - triggerType = Sensitivity.everything; - break; - case 1: - triggerType = Sensitivity.mobs; - break; - case 2: - triggerType = Sensitivity.players; - break; - default: - triggerType = null; - break; - } - - if (triggerType != null) - { + switch (te.triggerType) { + case 0: + triggerType = Sensitivity.everything; + break; + case 1: + triggerType = Sensitivity.mobs; + break; + case 2: + triggerType = Sensitivity.players; + break; + default: + triggerType = null; + break; + } + + if (triggerType != null) { List list = null; - if (triggerType == Sensitivity.everything) - { - list = par1World.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + if (triggerType == Sensitivity.everything) { + list = par1World.getEntitiesWithinAABBExcludingEntity( + (Entity) null, + AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); } - if (triggerType == Sensitivity.mobs) - { - list = par1World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + if (triggerType == Sensitivity.mobs) { + list = par1World.getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); } - if (triggerType == Sensitivity.players) - { - list = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); + if (triggerType == Sensitivity.players) { + list = par1World.getEntitiesWithinAABB( + EntityPlayer.class, + AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); } - if (list != null && !list.isEmpty()) - { + if (list != null && !list.isEmpty()) { Iterator iterator = list.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); - if (!entity.doesEntityNotTriggerPressurePlate()) - { + if (!entity.doesEntityNotTriggerPressurePlate()) { return entity; } } @@ -622,60 +580,54 @@ public Entity getMineTriggerer (World par1World, int par2, int par3, int par4) } @Override - public boolean canDropFromExplosion (Explosion par1Explosion) - { + public boolean canDropFromExplosion(Explosion par1Explosion) { return false; } @Override - public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); int i1 = l & 7; boolean flag = (l & 8) > 0; ForgeDirection dir = Helper.convertMetaToForgeOrientation(i1); - switch (dir) - { - case DOWN: - this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); - break; - case UP: - this.setBlockBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); - break; - case NORTH: - this.setBlockBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); - break; - case SOUTH: - this.setBlockBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); - break; - case EAST: - this.setBlockBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - case WEST: - this.setBlockBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - default: - this.setBlockBounds(0, 0, 0, 1, 1, 1); - break; + switch (dir) { + case DOWN: + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + break; + case UP: + this.setBlockBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + break; + case NORTH: + this.setBlockBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + break; + case SOUTH: + this.setBlockBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + break; + case EAST: + this.setBlockBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + case WEST: + this.setBlockBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + default: + this.setBlockBounds(0, 0, 0, 1, 1, 1); + break; } } @Override - public int damageDropped (int par1) - { + public int damageDropped(int par1) { return par1; } @Override - public Item getItemDropped (int par1, Random par2Random, int par3) - { + public Item getItemDropped(int par1, Random par2Random, int par3) { return null; } @Override - public TileEntity createNewTileEntity (World world, int meta) - { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityLandmine(); } } diff --git a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 1f16fb93abf..c2ab0fb6bbc 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -8,8 +8,7 @@ import net.minecraft.world.World; import tconstruct.util.DamageSourceFireworkExplode; -public class EntityLandmineFirework extends Entity -{ +public class EntityLandmineFirework extends Entity { /** The age of the firework in ticks. */ private int fireworkAge; @@ -23,20 +22,17 @@ public class EntityLandmineFirework extends Entity private int moveDirection = 0; - public EntityLandmineFirework(World par1World) - { + public EntityLandmineFirework(World par1World) { super(par1World); this.setSize(0.25F, 0.25F); } @Override - protected void entityInit () - { + protected void entityInit() { this.dataWatcher.addObjectByDataType(8, 5); } - public EntityLandmineFirework setRider (Entity entity) - { + public EntityLandmineFirework setRider(Entity entity) { rider = entity; return this; } @@ -47,13 +43,12 @@ public EntityLandmineFirework setRider (Entity entity) * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge * length * 64 * renderDistanceWeight Args: distance */ - public boolean isInRangeToRenderDist (double par1) - { + public boolean isInRangeToRenderDist(double par1) { return par1 < 4096.0D; } - public EntityLandmineFirework(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack, int moveDirection) - { + public EntityLandmineFirework( + World par1World, double par2, double par4, double par6, ItemStack par8ItemStack, int moveDirection) { super(par1World); this.fireworkAge = 0; this.setSize(0.25F, 0.25F); @@ -61,14 +56,12 @@ public EntityLandmineFirework(World par1World, double par2, double par4, double this.yOffset = 0.0F; int i = 1; - if (par8ItemStack != null && par8ItemStack.hasTagCompound()) - { + if (par8ItemStack != null && par8ItemStack.hasTagCompound()) { this.dataWatcher.updateObject(8, par8ItemStack); NBTTagCompound nbttagcompound = par8ItemStack.getTagCompound(); NBTTagCompound nbttagcompound1 = nbttagcompound.getCompoundTag("Fireworks"); - if (nbttagcompound1 != null) - { + if (nbttagcompound1 != null) { i += nbttagcompound1.getByte("Flight"); } } @@ -85,14 +78,12 @@ public EntityLandmineFirework(World par1World, double par2, double par4, double /** * Sets the velocity to the args. Args: x, y, z */ - public void setVelocity (double par1, double par3, double par5) - { + public void setVelocity(double par1, double par3, double par5) { this.motionX = par1; this.motionY = par3; this.motionZ = par5; - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) - { + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(par1 * par1 + par5 * par5); this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f) * 180.0D / Math.PI); @@ -103,10 +94,8 @@ public void setVelocity (double par1, double par3, double par5) * Called to update the entity's position/logic. */ @Override - public void onUpdate () - { - if (this.riddenByEntity == null && this.rider != null) - { + public void onUpdate() { + if (this.riddenByEntity == null && this.rider != null) { this.rider.mountEntity(this); } @@ -121,43 +110,45 @@ public void onUpdate () float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) - { + for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + this.rotationPitch - this.prevRotationPitch < -180.0F; + this.prevRotationPitch -= 360.0F) { ; } - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) - { + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; } - while (this.rotationYaw - this.prevRotationYaw < -180.0F) - { + while (this.rotationYaw - this.prevRotationYaw < -180.0F) { this.prevRotationYaw -= 360.0F; } - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) - { + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { this.prevRotationYaw += 360.0F; } this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - if (this.fireworkAge == 0) - { + if (this.fireworkAge == 0) { this.worldObj.playSoundAtEntity(this, "fireworks.launch", 3.0F, 1.0F); } ++this.fireworkAge; - if (this.worldObj.isRemote && this.fireworkAge % 2 < 2) - { - this.worldObj.spawnParticle("fireworksSpark", this.posX, this.posY - 0.3D, this.posZ, this.rand.nextGaussian() * 0.05D, -this.motionY * 0.5D, this.rand.nextGaussian() * 0.05D); + if (this.worldObj.isRemote && this.fireworkAge % 2 < 2) { + this.worldObj.spawnParticle( + "fireworksSpark", + this.posX, + this.posY - 0.3D, + this.posZ, + this.rand.nextGaussian() * 0.05D, + -this.motionY * 0.5D, + this.rand.nextGaussian() * 0.05D); } - if (!this.worldObj.isRemote && this.fireworkAge > this.lifetime) - { + if (!this.worldObj.isRemote && this.fireworkAge > this.lifetime) { this.worldObj.setEntityState(this, (byte) 17); this.rider.attackEntityFrom(new DamageSourceFireworkExplode("FireworkExplode"), 200F); this.setDead(); @@ -166,19 +157,17 @@ public void onUpdate () @Override @SideOnly(Side.CLIENT) - public void handleHealthUpdate (byte par1) - { - if (par1 == 17 && this.worldObj.isRemote) - { + public void handleHealthUpdate(byte par1) { + if (par1 == 17 && this.worldObj.isRemote) { ItemStack itemstack = this.dataWatcher.getWatchableObjectItemStack(8); NBTTagCompound nbttagcompound = null; - if (itemstack != null && itemstack.hasTagCompound()) - { + if (itemstack != null && itemstack.hasTagCompound()) { nbttagcompound = itemstack.getTagCompound().getCompoundTag("Fireworks"); } - this.worldObj.makeFireworks(this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound); + this.worldObj.makeFireworks( + this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound); } super.handleHealthUpdate(par1); @@ -188,14 +177,12 @@ public void handleHealthUpdate (byte par1) * (abstract) Protected helper method to write subclass entity data to NBT. */ @Override - public void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) - { + public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { par1NBTTagCompound.setInteger("Life", this.fireworkAge); par1NBTTagCompound.setInteger("LifeTime", this.lifetime); ItemStack itemstack = this.dataWatcher.getWatchableObjectItemStack(8); - if (itemstack != null) - { + if (itemstack != null) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); itemstack.writeToNBT(nbttagcompound1); par1NBTTagCompound.setTag("FireworksItem", nbttagcompound1); @@ -206,18 +193,15 @@ public void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override - public void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) - { + public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { this.fireworkAge = par1NBTTagCompound.getInteger("Life"); this.lifetime = par1NBTTagCompound.getInteger("LifeTime"); NBTTagCompound nbttagcompound1 = par1NBTTagCompound.getCompoundTag("FireworksItem"); - if (nbttagcompound1 != null) - { + if (nbttagcompound1 != null) { ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound1); - if (itemstack != null) - { + if (itemstack != null) { this.dataWatcher.updateObject(8, itemstack); } } @@ -225,8 +209,7 @@ public void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) @Override @SideOnly(Side.CLIENT) - public float getShadowSize () - { + public float getShadowSize() { return 0.0F; } @@ -234,15 +217,13 @@ public float getShadowSize () * Gets how bright this entity is. */ @Override - public float getBrightness (float par1) - { + public float getBrightness(float par1) { return super.getBrightness(par1); } @Override @SideOnly(Side.CLIENT) - public int getBrightnessForRender (float par1) - { + public int getBrightnessForRender(float par1) { return super.getBrightnessForRender(par1); } @@ -250,8 +231,7 @@ public int getBrightnessForRender (float par1) * If returns false, the item will not inflict any damage against entities. */ @Override - public boolean canAttackWithItem () - { + public boolean canAttackWithItem() { return false; } } diff --git a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index 52c6bf691fb..faa3a943141 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -7,24 +7,23 @@ import net.minecraft.world.*; import tconstruct.world.MiningExplosion; -public class ExplosivePrimed extends Entity -{ +public class ExplosivePrimed extends Entity { /** How long the fuse is */ public Block block; + public int metadata; public int fuse; private EntityLivingBase tntPlacedBy; - public ExplosivePrimed(World par1World) - { + public ExplosivePrimed(World par1World) { super(par1World); this.preventEntitySpawning = true; this.setSize(0.98F, 0.98F); this.yOffset = this.height / 2.0F; } - public ExplosivePrimed(World par1World, double par2, double par4, double par6, EntityLivingBase par8EntityLivingBase) - { + public ExplosivePrimed( + World par1World, double par2, double par4, double par6, EntityLivingBase par8EntityLivingBase) { this(par1World); this.setPosition(par2, par4, par6); float f = (float) (Math.random() * Math.PI * 2.0D); @@ -39,17 +38,14 @@ public ExplosivePrimed(World par1World, double par2, double par4, double par6, E } @Override - protected void entityInit () - { - } + protected void entityInit() {} /** * returns if this entity triggers Block.onEntityWalking on the blocks they * walk on. used for spiders and wolves to prevent them from trampling crops */ @Override - protected boolean canTriggerWalking () - { + protected boolean canTriggerWalking() { return false; } @@ -58,8 +54,7 @@ protected boolean canTriggerWalking () * this Entity. */ @Override - public boolean canBeCollidedWith () - { + public boolean canBeCollidedWith() { return !this.isDead; } @@ -67,8 +62,7 @@ public boolean canBeCollidedWith () * Called to update the entity's position/logic. */ @Override - public void onUpdate () - { + public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; @@ -78,36 +72,29 @@ public void onUpdate () this.motionY *= 0.9800000190734863D; this.motionZ *= 0.9800000190734863D; - if (this.onGround) - { + if (this.onGround) { this.motionX *= 0.699999988079071D; this.motionZ *= 0.699999988079071D; this.motionY *= -0.5D; } - if (this.fuse-- <= 0) - { + if (this.fuse-- <= 0) { this.setDead(); - if (!this.worldObj.isRemote) - { + if (!this.worldObj.isRemote) { this.explode(); } - } - else - { + } else { this.worldObj.spawnParticle("smoke", this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D); } } - private void explode () - { + private void explode() { float f = 5.0F; this.createExplosion(worldObj, this, this.posX, this.posY, this.posZ, f); } - public void createExplosion (World world, Entity par1Entity, double par2, double par4, double par6, float par8) - { + public void createExplosion(World world, Entity par1Entity, double par2, double par4, double par6, float par8) { Explosion explosion = new MiningExplosion(world, par1Entity, par2, par4, par6, par8); explosion.isFlaming = false; explosion.isSmoking = true; @@ -120,8 +107,7 @@ public void createExplosion (World world, Entity par1Entity, double par2, double * (abstract) Protected helper method to write subclass entity data to NBT. */ @Override - protected void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) - { + protected void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { par1NBTTagCompound.setByte("Fuse", (byte) this.fuse); } @@ -129,23 +115,20 @@ protected void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override - protected void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) - { + protected void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { this.fuse = par1NBTTagCompound.getByte("Fuse"); } @Override @SideOnly(Side.CLIENT) - public float getShadowSize () - { + public float getShadowSize() { return 0.0F; } /** * returns null or the entityliving it was placed or ignited by */ - public EntityLivingBase getTntPlacedBy () - { + public EntityLivingBase getTntPlacedBy() { return this.tntPlacedBy; } } diff --git a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java index 3db4b7f4231..79b4825efc9 100644 --- a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java @@ -10,42 +10,34 @@ import tconstruct.mechworks.landmine.behavior.Behavior; /** - * + * * @author fuj1n - * + * */ -public class GuiLandmine extends GuiContainer -{ +public class GuiLandmine extends GuiContainer { ContainerLandmine container; ResourceLocation background = new ResourceLocation("tinker:textures/gui/landmine.png"); - public GuiLandmine(ContainerLandmine par1Container) - { + public GuiLandmine(ContainerLandmine par1Container) { super(par1Container); container = par1Container; } @Override - protected void renderToolTip (ItemStack par1ItemStack, int par2, int par3) - { + protected void renderToolTip(ItemStack par1ItemStack, int par2, int par3) { List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); - if (b != null) - { + if (b != null) { b.getInformation(par1ItemStack, list); } - for (int k = 0; k < list.size(); ++k) - { - if (k == 0) - { + for (int k = 0; k < list.size(); ++k) { + if (k == 0) { list.set(k, par1ItemStack.getRarity().rarityColor + (String) list.get(k)); - } - else - { + } else { list.set(k, EnumChatFormatting.GRAY + (String) list.get(k)); } } @@ -55,27 +47,21 @@ protected void renderToolTip (ItemStack par1ItemStack, int par2, int par3) } @Override - protected void drawGuiContainerForegroundLayer (int i, int j) - { - if (container.te != null) - { + protected void drawGuiContainerForegroundLayer(int i, int j) { + if (container.te != null) { fontRendererObj.drawString(container.te.getInventoryName(), 8, 5, 4210752); - } - else - { + } else { fontRendererObj.drawString(StatCollector.translateToLocal("gui.landmine"), 8, 5, 4210752); } fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.renderEngine.bindTexture(background); int x = (width - xSize) / 2; int y = (height - ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); } - } diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index 4a1232cb9bd..6505227619e 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -10,12 +10,11 @@ import tconstruct.mechworks.logic.TileEntityLandmine; /** - * + * * @author fuj1n - * + * */ -public class ContainerLandmine extends Container -{ +public class ContainerLandmine extends Container { public TileEntityLandmine te; public EntityPlayer entityPlayer; @@ -23,62 +22,53 @@ public class ContainerLandmine extends Container private int field_94535_f = -1; private final Set field_94537_h = new HashSet(); - public ContainerLandmine(EntityPlayer player, TileEntityLandmine te) - { + public ContainerLandmine(EntityPlayer player, TileEntityLandmine te) { this.te = te; this.entityPlayer = player; addInventorySlots(te); bindPlayerInventory(player.inventory); } - public void addInventorySlots (TileEntityLandmine inv) - { + public void addInventorySlots(TileEntityLandmine inv) { addSlotToContainer(new SlotBehavedOnly(inv, 0, 35, 53)); addSlotToContainer(new SlotBehavedOnly(inv, 1, 80, 53)); addSlotToContainer(new SlotBehavedOnly(inv, 2, 125, 53)); addSlotToContainer(new SlotOpaqueBlocksOnly(inv, 3, 80, 21)); } - public void bindPlayerInventory (InventoryPlayer inventory) - { - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { + public void bindPlayerInventory(InventoryPlayer inventory) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 9; j++) { addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } } - for (int i = 0; i < 9; i++) - { + for (int i = 0; i < 9; i++) { addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); } } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = te.getWorldObj().getBlock(te.xCoord, te.yCoord, te.zCoord); - if (block != TinkerMechworks.landmine) - return false; + if (block != TinkerMechworks.landmine) return false; return te.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer par1EntityPlayer, int par2) - { + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { // This code actually works perfectly, but does not respect the global // TileEntity stack limit, shift clicking ability disabled. /* * ItemStack itemstack = null; Slot slot = (Slot) * this.inventorySlots.get(par2); - * + * * if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = * slot.getStack(); itemstack = itemstack1.copy(); - * + * * if (par2 == 2) { if (!this.mergeItemStack(itemstack1, 3, 39, true)) { * return null; } - * + * * slot.onSlotChange(itemstack1, itemstack); } else if (par2 != 1 && * par2 != 0) { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { if * (!this.mergeItemStack(itemstack1, 1, 2, false)) { if @@ -86,14 +76,14 @@ public ItemStack transferStackInSlot (EntityPlayer par1EntityPlayer, int par2) * else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, * 3, 30, false)) { return null; } } } } else if * (!this.mergeItemStack(itemstack1, 3, 39, false)) { return null; } - * + * * if (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); } * else { slot.onSlotChanged(); } - * + * * if (itemstack1.stackSize == itemstack.stackSize) { return null; } - * + * * slot.onPickupFromSlot(par1EntityPlayer, itemstack1); } - * + * * return itemstack; */ return null; @@ -101,74 +91,62 @@ public ItemStack transferStackInSlot (EntityPlayer par1EntityPlayer, int par2) /* Disabled for another(less buggy and sticky) system */ @Override - public ItemStack slotClick (int par1, int par2, int par3, EntityPlayer par4EntityPlayer) - { + public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) { ItemStack itemstack = null; InventoryPlayer inventoryplayer = par4EntityPlayer.inventory; int l; ItemStack itemstack1; - if (par3 == 5) - { + if (par3 == 5) { int i1 = this.field_94536_g; this.field_94536_g = func_94532_c(par2); - if ((i1 != 1 || this.field_94536_g != 2) && i1 != this.field_94536_g) - { + if ((i1 != 1 || this.field_94536_g != 2) && i1 != this.field_94536_g) { this.func_94533_d(); - } - else if (inventoryplayer.getItemStack() == null) - { + } else if (inventoryplayer.getItemStack() == null) { this.func_94533_d(); - } - else if (this.field_94536_g == 0) - { + } else if (this.field_94536_g == 0) { this.field_94535_f = func_94529_b(par2); - if (func_94528_d(this.field_94535_f)) - { + if (func_94528_d(this.field_94535_f)) { this.field_94536_g = 1; this.field_94537_h.clear(); - } - else - { + } else { this.func_94533_d(); } - } - else if (this.field_94536_g == 1) - { + } else if (this.field_94536_g == 1) { Slot slot = (Slot) this.inventorySlots.get(par1); - if (slot != null && func_94527_a(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) - { + if (slot != null + && func_94527_a(slot, inventoryplayer.getItemStack(), true) + && slot.isItemValid(inventoryplayer.getItemStack()) + && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() + && this.canDragIntoSlot(slot)) { this.field_94537_h.add(slot); } - } - else if (this.field_94536_g == 2) - { - if (!this.field_94537_h.isEmpty()) - { + } else if (this.field_94536_g == 2) { + if (!this.field_94537_h.isEmpty()) { itemstack1 = inventoryplayer.getItemStack().copy(); l = inventoryplayer.getItemStack().stackSize; Iterator iterator = this.field_94537_h.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { Slot slot1 = (Slot) iterator.next(); - if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) - { + if (slot1 != null + && func_94527_a(slot1, inventoryplayer.getItemStack(), true) + && slot1.isItemValid(inventoryplayer.getItemStack()) + && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() + && this.canDragIntoSlot(slot1)) { ItemStack itemstack2 = itemstack1.copy(); int j1 = slot1.getHasStack() ? slot1.getStack().stackSize : 0; func_94525_a(this.field_94537_h, this.field_94535_f, itemstack2, j1); - if (itemstack2.stackSize > itemstack2.getMaxStackSize()) - { + if (itemstack2.stackSize > itemstack2.getMaxStackSize()) { itemstack2.stackSize = itemstack2.getMaxStackSize(); } - if (itemstack2.stackSize > slot1.getSlotStackLimit()) - { + if (itemstack2.stackSize > slot1.getSlotStackLimit()) { itemstack2.stackSize = slot1.getSlotStackLimit(); } @@ -179,8 +157,7 @@ else if (this.field_94536_g == 2) itemstack1.stackSize = l; - if (itemstack1.stackSize <= 0) - { + if (itemstack1.stackSize <= 0) { itemstack1 = null; } @@ -188,49 +165,35 @@ else if (this.field_94536_g == 2) } this.func_94533_d(); - } - else - { + } else { this.func_94533_d(); } - } - else if (this.field_94536_g != 0) - { + } else if (this.field_94536_g != 0) { this.func_94533_d(); - } - else - { + } else { Slot slot2; int k1; ItemStack itemstack3; - if ((par3 == 0 || par3 == 1) && (par2 == 0 || par2 == 1)) - { - if (par1 == -999) - { - if (inventoryplayer.getItemStack() != null && par1 == -999) - { - if (par2 == 0) - { + if ((par3 == 0 || par3 == 1) && (par2 == 0 || par2 == 1)) { + if (par1 == -999) { + if (inventoryplayer.getItemStack() != null && par1 == -999) { + if (par2 == 0) { par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), false); inventoryplayer.setItemStack((ItemStack) null); } - if (par2 == 1) - { - par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1), false); + if (par2 == 1) { + par4EntityPlayer.dropPlayerItemWithRandomChoice( + inventoryplayer.getItemStack().splitStack(1), false); - if (inventoryplayer.getItemStack().stackSize == 0) - { + if (inventoryplayer.getItemStack().stackSize == 0) { inventoryplayer.setItemStack((ItemStack) null); } } } - } - else if (par3 == 1) - { - if (par1 < 0) - { + } else if (par3 == 1) { + if (par1 < 0) { return null; } @@ -238,26 +201,22 @@ else if (par3 == 1) slot2 = (Slot) this.inventorySlots.get(par1); - if (slot2 != null && slot2.canTakeStack(par4EntityPlayer)) - { + if (slot2 != null && slot2.canTakeStack(par4EntityPlayer)) { itemstack1 = this.transferStackInSlot(par4EntityPlayer, par1); - if (itemstack1 != null) - { + if (itemstack1 != null) { localObject2 = ((ItemStack) itemstack1).getItem(); itemstack = itemstack1.copy(); - if (slot2 != null && slot2.getStack() != null && slot2.getStack().getItem() == localObject2) - { + if (slot2 != null + && slot2.getStack() != null + && slot2.getStack().getItem() == localObject2) { this.retrySlotClick(par1, par2, true, par4EntityPlayer); } } } - } - else - { - if (par1 < 0) - { + } else { + if (par1 < 0) { return null; } @@ -265,119 +224,94 @@ else if (par3 == 1) boolean shouldDoStuff = true; - if ((!(slot2 instanceof SlotBehavedOnly))) - { + if ((!(slot2 instanceof SlotBehavedOnly))) { shouldDoStuff = false; } - if (slot2 != null) - { + if (slot2 != null) { itemstack1 = slot2.getStack(); ItemStack itemstack4 = inventoryplayer.getItemStack(); - if (itemstack1 != null) - { + if (itemstack1 != null) { itemstack = itemstack1.copy(); } - if (itemstack1 == null) - { - if (itemstack4 != null && slot2.isItemValid(itemstack4)) - { + if (itemstack1 == null) { + if (itemstack4 != null && slot2.isItemValid(itemstack4)) { k1 = par2 == 0 ? itemstack4.stackSize : 1; - if (k1 > slot2.getSlotStackLimit()) - { + if (k1 > slot2.getSlotStackLimit()) { k1 = slot2.getSlotStackLimit(); } - if (itemstack4.stackSize >= k1) - { + if (itemstack4.stackSize >= k1) { slot2.putStack(itemstack4.splitStack(k1)); } - if (itemstack4.stackSize == 0) - { + if (itemstack4.stackSize == 0) { inventoryplayer.setItemStack((ItemStack) null); } - } - else if (shouldDoStuff && slot2 instanceof SlotBehavedOnly && itemstack4 != null && slot2.isItemValid(new ItemStack(itemstack4.getItem(), 1, itemstack4.getItemDamage()))) - { + } else if (shouldDoStuff + && slot2 instanceof SlotBehavedOnly + && itemstack4 != null + && slot2.isItemValid( + new ItemStack(itemstack4.getItem(), 1, itemstack4.getItemDamage()))) { k1 = par2 == 0 ? 1 : 1; - if (k1 > slot2.getSlotStackLimit()) - { + if (k1 > slot2.getSlotStackLimit()) { k1 = slot2.getSlotStackLimit(); } - if (itemstack4.stackSize >= k1) - { + if (itemstack4.stackSize >= k1) { slot2.putStack(itemstack4.splitStack(k1)); } - if (itemstack4.stackSize == 0) - { + if (itemstack4.stackSize == 0) { inventoryplayer.setItemStack((ItemStack) null); } } - } - else if (slot2.canTakeStack(par4EntityPlayer)) - { - if (itemstack4 == null) - { + } else if (slot2.canTakeStack(par4EntityPlayer)) { + if (itemstack4 == null) { k1 = par2 == 0 ? itemstack1.stackSize : (itemstack1.stackSize + 1) / 2; itemstack3 = slot2.decrStackSize(k1); inventoryplayer.setItemStack(itemstack3); - if (itemstack1.stackSize == 0) - { + if (itemstack1.stackSize == 0) { slot2.putStack((ItemStack) null); } slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); - } - else if (slot2.isItemValid(itemstack4)) - { - if (ItemStack.areItemStacksEqual(itemstack1, itemstack4)) - { + } else if (slot2.isItemValid(itemstack4)) { + if (ItemStack.areItemStacksEqual(itemstack1, itemstack4)) { k1 = par2 == 0 ? itemstack4.stackSize : 1; - if (k1 > slot2.getSlotStackLimit() - itemstack1.stackSize) - { + if (k1 > slot2.getSlotStackLimit() - itemstack1.stackSize) { k1 = slot2.getSlotStackLimit() - itemstack1.stackSize; } - if (k1 > itemstack4.getMaxStackSize() - itemstack1.stackSize) - { + if (k1 > itemstack4.getMaxStackSize() - itemstack1.stackSize) { k1 = itemstack4.getMaxStackSize() - itemstack1.stackSize; } itemstack4.splitStack(k1); - if (itemstack4.stackSize == 0) - { + if (itemstack4.stackSize == 0) { inventoryplayer.setItemStack((ItemStack) null); } itemstack1.stackSize += k1; - } - else if (itemstack4.stackSize <= slot2.getSlotStackLimit()) - { + } else if (itemstack4.stackSize <= slot2.getSlotStackLimit()) { slot2.putStack(itemstack4); inventoryplayer.setItemStack(itemstack1); } - } - else if (ItemStack.areItemStacksEqual(itemstack1, itemstack4)) - { + } else if (ItemStack.areItemStacksEqual(itemstack1, itemstack4)) { k1 = itemstack1.stackSize; - if (k1 > 0 && k1 + itemstack4.stackSize <= itemstack4.getMaxStackSize()) - { + if (k1 > 0 && k1 + itemstack4.stackSize <= itemstack4.getMaxStackSize()) { itemstack4.stackSize += k1; itemstack1 = slot2.decrStackSize(k1); - if (itemstack1.stackSize == 0) - { + if (itemstack1.stackSize == 0) { slot2.putStack((ItemStack) null); } @@ -389,98 +323,92 @@ else if (ItemStack.areItemStacksEqual(itemstack1, itemstack4)) slot2.onSlotChanged(); } } - } - else if (par3 == 2 && par2 >= 0 && par2 < 9) - { + } else if (par3 == 2 && par2 >= 0 && par2 < 9) { slot2 = (Slot) this.inventorySlots.get(par1); - if (slot2.canTakeStack(par4EntityPlayer)) - { + if (slot2.canTakeStack(par4EntityPlayer)) { itemstack1 = inventoryplayer.getStackInSlot(par2); - boolean flag = itemstack1 == null || slot2.inventory == inventoryplayer && slot2.isItemValid(itemstack1); + boolean flag = + itemstack1 == null || slot2.inventory == inventoryplayer && slot2.isItemValid(itemstack1); k1 = -1; - if (!flag) - { + if (!flag) { k1 = inventoryplayer.getFirstEmptyStack(); flag |= k1 > -1; } - if (slot2.getHasStack() && flag) - { + if (slot2.getHasStack() && flag) { itemstack3 = slot2.getStack(); inventoryplayer.setInventorySlotContents(par2, itemstack3.copy()); - if ((slot2.inventory != inventoryplayer || !slot2.isItemValid(itemstack1)) && itemstack1 != null) - { - if (k1 > -1) - { + if ((slot2.inventory != inventoryplayer || !slot2.isItemValid(itemstack1)) + && itemstack1 != null) { + if (k1 > -1) { inventoryplayer.addItemStackToInventory(itemstack1); slot2.decrStackSize(itemstack3.stackSize); slot2.putStack((ItemStack) null); slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); } - } - else - { + } else { slot2.decrStackSize(itemstack3.stackSize); slot2.putStack(itemstack1); slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); } - } - else if (!slot2.getHasStack() && itemstack1 != null && slot2.isItemValid(itemstack1)) - { + } else if (!slot2.getHasStack() && itemstack1 != null && slot2.isItemValid(itemstack1)) { inventoryplayer.setInventorySlotContents(par2, (ItemStack) null); slot2.putStack(itemstack1); } } - } - else if (par3 == 3 && par4EntityPlayer.capabilities.isCreativeMode && inventoryplayer.getItemStack() == null && par1 >= 0) - { + } else if (par3 == 3 + && par4EntityPlayer.capabilities.isCreativeMode + && inventoryplayer.getItemStack() == null + && par1 >= 0) { slot2 = (Slot) this.inventorySlots.get(par1); - if (slot2 != null && slot2.getHasStack()) - { + if (slot2 != null && slot2.getHasStack()) { itemstack1 = slot2.getStack().copy(); itemstack1.stackSize = itemstack1.getMaxStackSize(); inventoryplayer.setItemStack(itemstack1); } - } - else if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0) - { + } else if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0) { slot2 = (Slot) this.inventorySlots.get(par1); - if (slot2 != null && slot2.getHasStack() && slot2.canTakeStack(par4EntityPlayer)) - { + if (slot2 != null && slot2.getHasStack() && slot2.canTakeStack(par4EntityPlayer)) { itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize); slot2.onPickupFromSlot(par4EntityPlayer, itemstack1); par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1, false); } - } - else if (par3 == 6 && par1 >= 0) - { + } else if (par3 == 6 && par1 >= 0) { slot2 = (Slot) this.inventorySlots.get(par1); itemstack1 = inventoryplayer.getItemStack(); - if (itemstack1 != null && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(par4EntityPlayer))) - { + if (itemstack1 != null + && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(par4EntityPlayer))) { l = par2 == 0 ? 0 : this.inventorySlots.size() - 1; k1 = par2 == 0 ? 1 : -1; - for (int l1 = 0; l1 < 2; ++l1) - { - for (int i2 = l; i2 >= 0 && i2 < this.inventorySlots.size() && itemstack1.stackSize < itemstack1.getMaxStackSize(); i2 += k1) - { + for (int l1 = 0; l1 < 2; ++l1) { + for (int i2 = l; + i2 >= 0 + && i2 < this.inventorySlots.size() + && itemstack1.stackSize < itemstack1.getMaxStackSize(); + i2 += k1) { Slot slot3 = (Slot) this.inventorySlots.get(i2); - if (slot3.getHasStack() && func_94527_a(slot3, itemstack1, true) && slot3.canTakeStack(par4EntityPlayer) && this.func_94530_a(itemstack1, slot3) && (l1 != 0 || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) - { - int j2 = Math.min(itemstack1.getMaxStackSize() - itemstack1.stackSize, slot3.getStack().stackSize); + if (slot3.getHasStack() + && func_94527_a(slot3, itemstack1, true) + && slot3.canTakeStack(par4EntityPlayer) + && this.func_94530_a(itemstack1, slot3) + && (l1 != 0 + || slot3.getStack().stackSize + != slot3.getStack().getMaxStackSize())) { + int j2 = Math.min( + itemstack1.getMaxStackSize() - itemstack1.stackSize, + slot3.getStack().stackSize); ItemStack itemstack5 = slot3.decrStackSize(j2); itemstack1.stackSize += j2; - if (itemstack5.stackSize <= 0) - { + if (itemstack5.stackSize <= 0) { slot3.putStack((ItemStack) null); } @@ -498,9 +426,7 @@ else if (par3 == 6 && par1 >= 0) } @Override - public boolean canDragIntoSlot (Slot par1Slot) - { + public boolean canDragIntoSlot(Slot par1Slot) { return false; } - } diff --git a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java index 518afb1164c..f2bbb3f74c8 100644 --- a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java @@ -10,64 +10,66 @@ import tconstruct.mechworks.logic.TileEntityLandmine; /** - * + * * @author fuj1n - * + * */ -public class ItemBlockLandmine extends ItemBlock -{ +public class ItemBlockLandmine extends ItemBlock { - public ItemBlockLandmine(Block b) - { + public ItemBlockLandmine(Block b) { super(b); this.setHasSubtypes(true); } @Override - public void addInformation (ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { String interaction = null; - switch (par1ItemStack.getItemDamage()) - { - case 0: - interaction = StatCollector.translateToLocal("landmine1.tooltip"); - break; - case 1: - interaction = StatCollector.translateToLocal("landmine2.tooltip"); - break; - case 2: - interaction = StatCollector.translateToLocal("landmine3.tooltip"); - break; - default: - interaction = StatCollector.translateToLocal("landmine4.tooltip"); - break; + switch (par1ItemStack.getItemDamage()) { + case 0: + interaction = StatCollector.translateToLocal("landmine1.tooltip"); + break; + case 1: + interaction = StatCollector.translateToLocal("landmine2.tooltip"); + break; + case 2: + interaction = StatCollector.translateToLocal("landmine3.tooltip"); + break; + default: + interaction = StatCollector.translateToLocal("landmine4.tooltip"); + break; } par3List.add(StatCollector.translateToLocal("landmine5.tooltip") + interaction); } @Override - public int getMetadata (int par1) - { + public int getMetadata(int par1) { return 0; } @Override - public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) - { - if (!world.setBlock(x, y, z, TinkerMechworks.landmine, metadata, 3)) - { + public boolean placeBlockAt( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ, + int metadata) { + if (!world.setBlock(x, y, z, TinkerMechworks.landmine, metadata, 3)) { return false; } - if (world.getBlock(x, y, z) == TinkerMechworks.landmine) - { + if (world.getBlock(x, y, z) == TinkerMechworks.landmine) { TinkerMechworks.landmine.onBlockPlacedBy(world, x, y, z, player, stack); TileEntityLandmine te = (TileEntityLandmine) world.getTileEntity(x, y, z); - if (te == null) - { + if (te == null) { te = (TileEntityLandmine) TinkerMechworks.landmine.createTileEntity(world, metadata); } @@ -80,9 +82,7 @@ public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, return true; } - public static Random getRandom () - { + public static Random getRandom() { return itemRand; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/Helper.java b/src/main/java/tconstruct/mechworks/landmine/Helper.java index 1a741ce2016..50379f50428 100644 --- a/src/main/java/tconstruct/mechworks/landmine/Helper.java +++ b/src/main/java/tconstruct/mechworks/landmine/Helper.java @@ -5,40 +5,36 @@ import net.minecraftforge.common.util.ForgeDirection; /** - * + * * @author fuj1n - * + * */ -public class Helper -{ +public class Helper { - public static ForgeDirection convertMetaToForgeOrientation (int metadata) - { - switch (metadata) - { - case 6: - return ForgeDirection.DOWN; - case 7: - return ForgeDirection.UP; - case 1: - return ForgeDirection.WEST; - case 3: - return ForgeDirection.NORTH; - case 2: - return ForgeDirection.EAST; - case 4: - return ForgeDirection.SOUTH; - case 5: - return ForgeDirection.DOWN; - case 0: - return ForgeDirection.UP; + public static ForgeDirection convertMetaToForgeOrientation(int metadata) { + switch (metadata) { + case 6: + return ForgeDirection.DOWN; + case 7: + return ForgeDirection.UP; + case 1: + return ForgeDirection.WEST; + case 3: + return ForgeDirection.NORTH; + case 2: + return ForgeDirection.EAST; + case 4: + return ForgeDirection.SOUTH; + case 5: + return ForgeDirection.DOWN; + case 0: + return ForgeDirection.UP; } return ForgeDirection.UNKNOWN; } - public static void renderInventoryCube (Block block, int metadata, int modelID, RenderBlocks renderer) - { + public static void renderInventoryCube(Block block, int metadata, int modelID, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); @@ -71,5 +67,4 @@ public static void renderInventoryCube (Block block, int metadata, int modelID, renderer.renderFaceZNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); tessellator.draw(); } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java index 9753f824a07..aa9b875c3c5 100644 --- a/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java +++ b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java @@ -3,34 +3,29 @@ import net.minecraft.block.Block; import net.minecraft.item.*; -public class LandmineStack -{ +public class LandmineStack { public final boolean isBlock; public final Block block; public final Item item; public final int meta; - public LandmineStack(Block block) - { + public LandmineStack(Block block) { this(block, -314159265); } - public LandmineStack(Item item) - { + public LandmineStack(Item item) { this(item, -314159265); } - public LandmineStack(Block block, int meta) - { + public LandmineStack(Block block, int meta) { isBlock = true; this.block = block; this.item = null; this.meta = meta; } - public LandmineStack(Item item, int meta) - { + public LandmineStack(Item item, int meta) { isBlock = false; this.block = null; this.item = item; @@ -38,42 +33,28 @@ public LandmineStack(Item item, int meta) } @Override - public boolean equals (Object o) - { + public boolean equals(Object o) { // Comparing landmine stacks - if (o instanceof LandmineStack) - { + if (o instanceof LandmineStack) { LandmineStack stack = (LandmineStack) o; - if (isBlock) - { + if (isBlock) { return block == stack.block && (meta == stack.meta || meta == -314159265); - } - else - { + } else { return item == stack.item && (meta == stack.meta || meta == -314159265); } // Comparing landmine stacks with item stacks - } - else if (o instanceof ItemStack) - { + } else if (o instanceof ItemStack) { ItemStack stack = (ItemStack) o; - if (isBlock && stack.getItem() instanceof ItemBlock) - { - return block == ((ItemBlock) stack.getItem()).field_150939_a && (meta == stack.getItemDamage() || meta == -314159265); - } - else if (!isBlock) - { + if (isBlock && stack.getItem() instanceof ItemBlock) { + return block == ((ItemBlock) stack.getItem()).field_150939_a + && (meta == stack.getItemDamage() || meta == -314159265); + } else if (!isBlock) { return item == stack.getItem() && (meta == stack.getItemDamage() || meta == -314159265); - } - else - { + } else { return false; } - } - else - { + } else { return false; } } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index fb1e0098a38..e3735873d08 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -11,12 +11,11 @@ import tconstruct.mechworks.landmine.*; /** - * + * * @author fuj1n - * + * */ -public abstract class Behavior -{ +public abstract class Behavior { public static HashMap behaviorsListItems = new HashMap(); public static HashMap behaviorsListBlocks = new HashMap(); @@ -33,8 +32,7 @@ public abstract class Behavior public static Behavior shoot = new BehaviorProjectile(); public static Behavior shear = new BehaviorShears(); - public static void registerBuiltInBehaviors () - { + public static void registerBuiltInBehaviors() { defaultBehavior = new BehaviorDefault(); addBehavior(new LandmineStack(Items.stick), dummy); @@ -54,161 +52,136 @@ public static void registerBuiltInBehaviors () // Make sure the part below this comment is executed last(to avoid // conflicts) Iterator i1 = Block.blockRegistry.iterator(); - while (i1.hasNext()) - { + while (i1.hasNext()) { Object ob = i1.next(); - if (ob != null && ob instanceof Block) - { + if (ob != null && ob instanceof Block) { Block b = (Block) ob; - if (b.getMaterial().isOpaque() && b.renderAsNormalBlock() && !b.canProvidePower() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(b))) - { + if (b.getMaterial().isOpaque() + && b.renderAsNormalBlock() + && !b.canProvidePower() + && !(b instanceof ITileEntityProvider) + && !behaviorsListBlocks.containsKey(new ItemStack(b))) { addBehavior(new LandmineStack(b), blockThrow); } } } } - public static Behavior getBehaviorFromStack (ItemStack par1ItemStack) - { - if (par1ItemStack == null) - { + public static Behavior getBehaviorFromStack(ItemStack par1ItemStack) { + if (par1ItemStack == null) { return null; } - if (par1ItemStack.getItem() instanceof ItemBlock) - { - if (!behaviorsListBlocks.isEmpty()) - { - for (int i = 0; i < behaviorsListBlocks.size(); i++) - { - LandmineStack st = (LandmineStack) behaviorsListBlocks.keySet().toArray()[i]; - if (st.equals(par1ItemStack)) - { + if (par1ItemStack.getItem() instanceof ItemBlock) { + if (!behaviorsListBlocks.isEmpty()) { + for (int i = 0; i < behaviorsListBlocks.size(); i++) { + LandmineStack st = + (LandmineStack) behaviorsListBlocks.keySet().toArray()[i]; + if (st.equals(par1ItemStack)) { return (Behavior) behaviorsListBlocks.values().toArray()[i]; } } return null; - } - else - { + } else { return null; } - } - else - { - if (!behaviorsListItems.isEmpty()) - { - for (int i = 0; i < behaviorsListItems.size(); i++) - { - LandmineStack st = (LandmineStack) behaviorsListItems.keySet().toArray()[i]; - if (st.equals(par1ItemStack)) - { + } else { + if (!behaviorsListItems.isEmpty()) { + for (int i = 0; i < behaviorsListItems.size(); i++) { + LandmineStack st = + (LandmineStack) behaviorsListItems.keySet().toArray()[i]; + if (st.equals(par1ItemStack)) { return (Behavior) behaviorsListItems.values().toArray()[i]; } } return null; - } - else - { + } else { return null; } } } - public static Behavior getDefaulBehavior () - { + public static Behavior getDefaulBehavior() { return defaultBehavior; } - public static void addBehavior (LandmineStack par1LandmineStack, Behavior par2Behavior) - { - if (par1LandmineStack.isBlock) - { - if (!behaviorsListBlocks.containsKey(par1LandmineStack)) - { + public static void addBehavior(LandmineStack par1LandmineStack, Behavior par2Behavior) { + if (par1LandmineStack.isBlock) { + if (!behaviorsListBlocks.containsKey(par1LandmineStack)) { behaviorsListBlocks.put(par1LandmineStack, par2Behavior); } - } - else - { - if (!behaviorsListItems.containsKey(par1LandmineStack)) - { + } else { + if (!behaviorsListItems.containsKey(par1LandmineStack)) { behaviorsListItems.put(par1LandmineStack, par2Behavior); } } } - public abstract void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved); + public abstract void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved); - public int getStackLimit (ItemStack par1ItemStack) - { + public int getStackLimit(ItemStack par1ItemStack) { return 1; } - public void getInformation (ItemStack par1ItemStack, List par2List) - { - } + public void getInformation(ItemStack par1ItemStack, List par2List) {} // Will return false if the effect does not stack among the slots - public boolean effectStacks () - { + public boolean effectStacks() { return true; } - public EnumFacing getFacing (World par1World, int par2, int par3, int par4) - { + public EnumFacing getFacing(World par1World, int par2, int par3, int par4) { ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); - switch (dir) - { - case DOWN: - return EnumFacing.UP; - case UP: - return EnumFacing.DOWN; - case WEST: - return EnumFacing.WEST; - case EAST: - return EnumFacing.EAST; - case SOUTH: - return EnumFacing.NORTH; - case NORTH: - return EnumFacing.SOUTH; - default: - return EnumFacing.UP; + switch (dir) { + case DOWN: + return EnumFacing.UP; + case UP: + return EnumFacing.DOWN; + case WEST: + return EnumFacing.WEST; + case EAST: + return EnumFacing.EAST; + case SOUTH: + return EnumFacing.NORTH; + case NORTH: + return EnumFacing.SOUTH; + default: + return EnumFacing.UP; } } - public boolean doesBehaviorPreventRemovalOfBlock (ItemStack par1ItemStack) - { + public boolean doesBehaviorPreventRemovalOfBlock(ItemStack par1ItemStack) { return false; } - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return true; } - public boolean isBehaviorExchangableWithOffensive (ItemStack par1ItemStack) - { + public boolean isBehaviorExchangableWithOffensive(ItemStack par1ItemStack) { return true; } - public boolean shouldItemBeRemoved (ItemStack par1ItemStack, boolean willBlockGetRemoved) - { + public boolean shouldItemBeRemoved(ItemStack par1ItemStack, boolean willBlockGetRemoved) { return true; } - public static final int arrayIndexOfStack (ArrayList stacks, ItemStack item) - { + public static final int arrayIndexOfStack(ArrayList stacks, ItemStack item) { Iterator i1 = stacks.iterator(); int index = 0; - while (i1.hasNext()) - { + while (i1.hasNext()) { ItemStack stack = i1.next(); - if (stack.isItemEqual(item)) - { + if (stack.isItemEqual(item)) { return index; } index++; @@ -217,15 +190,12 @@ public static final int arrayIndexOfStack (ArrayList stacks, ItemStac return -1; } - public static final boolean arrayContainsEqualStack (ArrayList stacks, ItemStack item) - { + public static final boolean arrayContainsEqualStack(ArrayList stacks, ItemStack item) { Iterator i1 = stacks.iterator(); - while (i1.hasNext()) - { + while (i1.hasNext()) { ItemStack stack = i1.next(); - if (stack.isItemEqual(item)) - { + if (stack.isItemEqual(item)) { return true; } } @@ -233,9 +203,7 @@ public static final boolean arrayContainsEqualStack (ArrayList stacks return false; } - public boolean overridesDefault () - { + public boolean overridesDefault() { return false; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java index 9d23856696e..6a7c9aaa863 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java @@ -7,63 +7,72 @@ import net.minecraft.world.World; /** - * + * * @author fuj1n - * + * */ -public class BehaviorBlockThrow extends Behavior -{ +public class BehaviorBlockThrow extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { - for (int i = 0; i < par5ItemStack.stackSize; i++) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { + for (int i = 0; i < par5ItemStack.stackSize; i++) { int direction = par1World.rand.nextInt(8); double speed = 2D * Math.random() + 0.01D; double upVecReduction = 0.25D; double randomnessFactor = 0.5D; double vec0 = 0, vec1 = par1World.rand.nextDouble() * upVecReduction, vec2 = 0; - switch (direction) - { - case 0: - vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; - // vec2 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 1: - vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; - // vec2 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 2: - vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; - // vec0 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 3: - vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; - // vec0 = par1World.rand.nextDouble() * randomnessFactor; - break; - case 4: - vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; - vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; - break; - case 5: - vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; - vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; - break; - case 6: - vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; - vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; - break; - case 7: - vec0 = -speed; - vec2 = -speed; - break; - default: - vec0 = speed; - break; + switch (direction) { + case 0: + vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; + // vec2 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 1: + vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; + // vec2 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 2: + vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; + // vec0 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 3: + vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; + // vec0 = par1World.rand.nextDouble() * randomnessFactor; + break; + case 4: + vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; + vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; + break; + case 5: + vec0 = speed + par1World.rand.nextDouble() * randomnessFactor; + vec2 = -speed + par1World.rand.nextDouble() * randomnessFactor; + break; + case 6: + vec0 = -speed + par1World.rand.nextDouble() * randomnessFactor; + vec2 = speed + par1World.rand.nextDouble() * randomnessFactor; + break; + case 7: + vec0 = -speed; + vec2 = -speed; + break; + default: + vec0 = speed; + break; } - EntityFallingBlock entityfallingsand = new EntityFallingBlock(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), BlockUtils.getBlockFromItemStack(par5ItemStack), par5ItemStack.getItemDamage()); + EntityFallingBlock entityfallingsand = new EntityFallingBlock( + par1World, + (double) ((float) par2 + 0.5F), + (double) ((float) par3 + 2F), + (double) ((float) par4 + 0.5F), + BlockUtils.getBlockFromItemStack(par5ItemStack), + par5ItemStack.getItemDamage()); entityfallingsand.preventEntitySpawning = false; entityfallingsand.ticksExisted = 2; entityfallingsand.motionX = vec0; @@ -74,14 +83,12 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return true; } @Override - public int getStackLimit (ItemStack par1ItemStack) - { + public int getStackLimit(ItemStack par1ItemStack) { return 64; } } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java index c4b34c0c59f..68d67f4a2d5 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDefault.java @@ -5,16 +5,19 @@ import net.minecraft.world.World; import tconstruct.util.DamageSourceLandmine; -public class BehaviorDefault extends Behavior -{ +public class BehaviorDefault extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { - if (triggerer != null) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { + if (triggerer != null) { triggerer.attackEntityFrom(new DamageSourceLandmine("Landmine"), 5F); } } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java index 4d5c35106a7..eae0d6aa0f3 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorDummy.java @@ -5,15 +5,19 @@ import net.minecraft.world.World; /** - * + * * @author fuj1n - * + * */ -public class BehaviorDummy extends Behavior -{ +public class BehaviorDummy extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { - } + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) {} } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java index f058534ee91..608df51e742 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java @@ -8,39 +8,43 @@ import net.minecraft.world.World; /** - * + * * @author fuj1n - * + * */ -public class BehaviorExplosive extends Behavior -{ +public class BehaviorExplosive extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { float explodeStrenght = 0; - if (par5ItemStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) - { + if (par5ItemStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) { explodeStrenght = 4.0F * par5ItemStack.stackSize; - } - else if (par5ItemStack.getItem() == Items.gunpowder) - { + } else if (par5ItemStack.getItem() == Items.gunpowder) { explodeStrenght = 0.8F * par5ItemStack.stackSize; } - par1World.createExplosion(new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null), par2, par3, par4, explodeStrenght, true); + par1World.createExplosion( + new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null), + par2, + par3, + par4, + explodeStrenght, + true); } @Override - public void getInformation (ItemStack par1ItemStack, List par2List) - { + public void getInformation(ItemStack par1ItemStack, List par2List) { String str = "UNDEFINED"; - if (par1ItemStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) - { + if (par1ItemStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) { str = "medium"; - } - else if (par1ItemStack.getItem() == Items.gunpowder) - { + } else if (par1ItemStack.getItem() == Items.gunpowder) { str = "small"; } @@ -49,8 +53,7 @@ else if (par1ItemStack.getItem() == Items.gunpowder) } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return true; } @@ -58,9 +61,7 @@ public boolean isOffensive (ItemStack par1ItemStack) // Change this to false to greatly decrease the maximum potential of // explosions but at the same time, make them launch the player much // higher(I mean the explosions with 2 or more TNT - public boolean effectStacks () - { + public boolean effectStacks() { return true; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java index 485a4d07718..0833648aec6 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java @@ -10,20 +10,24 @@ import tconstruct.mechworks.itemblocks.ItemBlockLandmine; /** - * + * * @author fuj1n - * + * */ -public class BehaviorFirecharge extends Behavior -{ +public class BehaviorFirecharge extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { EnumFacing face = getFacing(par1World, par2, par3, par4); - for (int n = 0; n < par5ItemStack.stackSize; n++) - { + for (int n = 0; n < par5ItemStack.stackSize; n++) { triggerer.attackEntityFrom(DamageSource.generic, 9F); triggerer.setFire(4); double d0 = par2 + (double) ((float) face.getFrontOffsetX() * 0.3F); @@ -35,12 +39,13 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta double d5 = random.nextGaussian() * 0.05D + (double) face.getFrontOffsetZ(); par1World.spawnEntityInWorld(new EntitySmallFireball(par1World, d0, d1, d2, d3, d4, d5)); - for (int i = par2 - 2; i <= (par2 + 2); i++) - { - for (int j = par4 - 2; j <= (par4 + 2); j++) - { - if ((par1World.getBlock(i, par3, j) == null || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isReplaceable(par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) - { + for (int i = par2 - 2; i <= (par2 + 2); i++) { + for (int j = par4 - 2; j <= (par4 + 2); j++) { + if ((par1World.getBlock(i, par3, j) == null + || (par1World.getBlock(i, par3, j) != null + && par1World.getBlock(i, par3, j).isReplaceable(par1World, i, par3, j))) + && ItemBlockLandmine.getRandom().nextInt(5) == 0 + && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) { par1World.setBlock(i, par3, j, Blocks.fire); } } @@ -49,8 +54,7 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return true; } } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java index 891fa2e0852..00bac0a233e 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java @@ -8,53 +8,53 @@ import tconstruct.mechworks.entity.item.EntityLandmineFirework; /** - * + * * @author fuj1n - * + * */ -public class BehaviorFirework extends Behavior -{ +public class BehaviorFirework extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { EnumFacing facing = getFacing(par1World, par2, par3, par4); - for (int i = 0; i < par5ItemStack.stackSize; i++) - { + for (int i = 0; i < par5ItemStack.stackSize; i++) { // TODO entity registration and stuffs - EntityLandmineFirework entityfireworkrocket = new EntityLandmineFirework(par1World, (double) par2, (double) par3, (double) par4, par5ItemStack, facing.ordinal()).setRider(i == 0 ? triggerer : null); + EntityLandmineFirework entityfireworkrocket = new EntityLandmineFirework( + par1World, (double) par2, (double) par3, (double) par4, par5ItemStack, facing.ordinal()) + .setRider(i == 0 ? triggerer : null); par1World.spawnEntityInWorld(entityfireworkrocket); boolean shouldRun = true; - if (triggerer instanceof EntityPlayer) - { + if (triggerer instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) triggerer; - if (player.capabilities.isCreativeMode) - { + if (player.capabilities.isCreativeMode) { // Remove the bellow comment to make the player in creative // mode not get launched // shouldRun = false; } } - if (shouldRun) - { + if (shouldRun) { triggerer.mountEntity(entityfireworkrocket); } } } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return false; } @Override - public boolean overridesDefault () - { + public boolean overridesDefault() { return true; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java index 56ab431f2f8..981b8a69d89 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java @@ -11,50 +11,47 @@ import tconstruct.mechworks.itemblocks.ItemBlockLandmine; /** - * + * * @author fuj1n - * + * */ -public class BehaviorPotion extends Behavior -{ +public class BehaviorPotion extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { - if (ItemPotion.isSplash(par5ItemStack.getItemDamage())) - { - par1World.playSoundAtEntity(triggerer, "random.bow", 0.5F, 0.4F / (ItemBlockLandmine.getRandom().nextFloat() * 0.4F + 0.8F)); + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { + if (ItemPotion.isSplash(par5ItemStack.getItemDamage())) { + par1World.playSoundAtEntity( + triggerer, + "random.bow", + 0.5F, + 0.4F / (ItemBlockLandmine.getRandom().nextFloat() * 0.4F + 0.8F)); - if (!par1World.isRemote) - { - if (triggerer instanceof EntityLivingBase) - { - par1World.spawnEntityInWorld(new EntityPotion(par1World, (EntityLivingBase) triggerer, par5ItemStack)); - } - else - { + if (!par1World.isRemote) { + if (triggerer instanceof EntityLivingBase) { + par1World.spawnEntityInWorld( + new EntityPotion(par1World, (EntityLivingBase) triggerer, par5ItemStack)); + } else { par1World.spawnEntityInWorld(new EntityPotion(par1World, par2, par3, par4, par5ItemStack)); } } - } - else - { - if (triggerer instanceof EntityPlayer) - { + } else { + if (triggerer instanceof EntityPlayer) { Items.potionitem.onEaten(par5ItemStack, par1World, (EntityPlayer) triggerer); - } - else if (triggerer instanceof EntityLivingBase) - { - if (!par1World.isRemote) - { + } else if (triggerer instanceof EntityLivingBase) { + if (!par1World.isRemote) { List list = Items.potionitem.getEffects(par5ItemStack); - if (list != null) - { + if (list != null) { Iterator iterator = list.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { PotionEffect potioneffect = (PotionEffect) iterator.next(); ((EntityLivingBase) triggerer).addPotionEffect(new PotionEffect(potioneffect)); } @@ -65,8 +62,7 @@ else if (triggerer instanceof EntityLivingBase) } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return false; } } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java index 23b81087e98..53e6a92151d 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPreventExplode.java @@ -4,36 +4,35 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class BehaviorPreventExplode extends Behavior -{ +public class BehaviorPreventExplode extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { - } + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) {} @Override - public boolean isBehaviorExchangableWithOffensive (ItemStack par1ItemStack) - { + public boolean isBehaviorExchangableWithOffensive(ItemStack par1ItemStack) { return false; } @Override - public boolean doesBehaviorPreventRemovalOfBlock (ItemStack par1ItemStack) - { + public boolean doesBehaviorPreventRemovalOfBlock(ItemStack par1ItemStack) { return true; } @Override - public boolean shouldItemBeRemoved (ItemStack par1ItemStack, boolean willBlockBeRemoved) - { + public boolean shouldItemBeRemoved(ItemStack par1ItemStack, boolean willBlockBeRemoved) { return false; } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return false; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java index f8409e416d1..1a02b1ddcdf 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java @@ -9,48 +9,49 @@ import net.minecraft.world.World; /** - * + * * @author fuj1n - * + * */ -public class BehaviorProjectile extends Behavior -{ +public class BehaviorProjectile extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { IProjectile entity = null; EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); - if (par5ItemStack.getItem() == Items.arrow) - { + if (par5ItemStack.getItem() == Items.arrow) { entity = new EntityArrow(par1World, par2, par3, par4); ((EntityArrow) entity).canBePickedUp = 1; - } - else if (par5ItemStack.getItem() == Items.snowball) - { + } else if (par5ItemStack.getItem() == Items.snowball) { entity = new EntitySnowball(par1World, par2, par3, par4); - } - else if (par5ItemStack.getItem() == Items.ender_pearl) - { - if (triggerer instanceof EntityLivingBase) - { + } else if (par5ItemStack.getItem() == Items.ender_pearl) { + if (triggerer instanceof EntityLivingBase) { entity = new EntityEnderPearl(par1World, (EntityLivingBase) triggerer); ((EntityEnderPearl) entity).setPosition(par2, par3, par4); - } - else - { + } else { entity = new EntityEnderPearl(par1World, par2, par3, par4); } } - if (entity == null) - { + if (entity == null) { return; } - entity.setThrowableHeading((double) enumfacing.getFrontOffsetX(), (double) ((float) enumfacing.getFrontOffsetY() + 0.1F), (double) enumfacing.getFrontOffsetZ(), 1.1F, 6.0F); + entity.setThrowableHeading( + (double) enumfacing.getFrontOffsetX(), + (double) ((float) enumfacing.getFrontOffsetY() + 0.1F), + (double) enumfacing.getFrontOffsetZ(), + 1.1F, + 6.0F); par1World.spawnEntityInWorld((Entity) entity); par1World.playAuxSFX(1002, par2, par3, par4, 0); } @@ -58,9 +59,7 @@ else if (par5ItemStack.getItem() == Items.ender_pearl) // Projectiles: snowballs, arrows @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return true; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java index c97adcedc84..fe39875e4a5 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java @@ -10,49 +10,54 @@ import net.minecraftforge.common.IShearable; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; -//TODO Add a block that is similar to landmine, but only triggers by redstone, does not hurt the player, and does not disappear when used(also does not do anything that can deal damage) +// TODO Add a block that is similar to landmine, but only triggers by redstone, does not hurt the player, and does not +// disappear when used(also does not do anything that can deal damage) /** - * + * * @author fuj1n - * + * */ -public class BehaviorShears extends Behavior -{ +public class BehaviorShears extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { Random rand = ItemBlockLandmine.getRandom(); - List sheeps = par1World.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getBoundingBox(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2)); + List sheeps = par1World.getEntitiesWithinAABB( + IShearable.class, + AxisAlignedBB.getBoundingBox(par2 - 2, par3 - 2, par4 - 2, par2 + 2, par3 + 2, par4 + 2)); - if (sheeps != null && !sheeps.isEmpty()) - { + if (sheeps != null && !sheeps.isEmpty()) { Iterator i1 = sheeps.iterator(); IShearable sheep; - while (i1.hasNext()) - { + while (i1.hasNext()) { sheep = i1.next(); - if (sheep.isShearable(par5ItemStack, par1World, par2, par3, par4)) - { - if (rand.nextInt(2) == 0) - { - ArrayList drops = sheep.onSheared(par5ItemStack, par1World, par2, par3, par4, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, par5ItemStack)); - if (sheep instanceof EntityLivingBase) - { + if (sheep.isShearable(par5ItemStack, par1World, par2, par3, par4)) { + if (rand.nextInt(2) == 0) { + ArrayList drops = sheep.onSheared( + par5ItemStack, + par1World, + par2, + par3, + par4, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, par5ItemStack)); + if (sheep instanceof EntityLivingBase) { par5ItemStack.damageItem(1, (EntityLivingBase) sheep); } Iterator i2 = drops.iterator(); - while (i2.hasNext()) - { - if (sheep instanceof Entity) - { + while (i2.hasNext()) { + if (sheep instanceof Entity) { Entity ent = (Entity) sheep; dropItem(par1World, (int) ent.posX, (int) ent.posY, (int) ent.posZ, i2.next()); - } - else - { + } else { dropItem(par1World, par2, par3, par4, i2.next()); } } @@ -61,21 +66,19 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta } } - if (willBlockBeRemoved) - { + if (willBlockBeRemoved) { dropItem(par1World, par2, par3, par4, par5ItemStack); } } - protected void dropItem (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack) - { - if (!par1World.isRemote && par1World.getGameRules().getGameRuleBooleanValue("doTileDrops")) - { + protected void dropItem(World par1World, int par2, int par3, int par4, ItemStack par5ItemStack) { + if (!par1World.isRemote && par1World.getGameRules().getGameRuleBooleanValue("doTileDrops")) { float f = 0.7F; double d0 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack); + EntityItem entityitem = new EntityItem( + par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack); entityitem.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(entityitem); } @@ -84,21 +87,17 @@ protected void dropItem (World par1World, int par2, int par3, int par4, ItemStac // Shear some sheep around a small area @Override - public boolean shouldItemBeRemoved (ItemStack par1ItemStack, boolean willBlockBeRemoved) - { + public boolean shouldItemBeRemoved(ItemStack par1ItemStack, boolean willBlockBeRemoved) { return willBlockBeRemoved; } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return false; } @Override - public boolean effectStacks () - { + public boolean effectStacks() { return false; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java index 8a67ca57b87..5a7a4faf435 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java @@ -6,38 +6,39 @@ import net.minecraft.world.World; /** - * + * * @author fuj1n - * + * */ -public class BehaviorSpawnEgg extends Behavior -{ +public class BehaviorSpawnEgg extends Behavior { @Override - public void executeLogic (World par1World, int par2, int par3, int par4, ItemStack par5ItemStack, Entity triggerer, boolean willBlockBeRemoved) - { + public void executeLogic( + World par1World, + int par2, + int par3, + int par4, + ItemStack par5ItemStack, + Entity triggerer, + boolean willBlockBeRemoved) { EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); double d0 = par2 + Math.random() + (double) enumfacing.getFrontOffsetX(); double d1 = (double) ((float) par3 + 0.2F); double d2 = par4 + Math.random() + (double) enumfacing.getFrontOffsetZ(); Entity entity = ItemMonsterPlacer.spawnCreature(par1World, par5ItemStack.getItemDamage(), d0, d1, d2); - if (entity instanceof EntityLivingBase && par5ItemStack.hasDisplayName()) - { + if (entity instanceof EntityLivingBase && par5ItemStack.hasDisplayName()) { ((EntityLiving) entity).setCustomNameTag(par5ItemStack.getDisplayName()); } } @Override - public boolean effectStacks () - { + public boolean effectStacks() { return false; } @Override - public boolean isOffensive (ItemStack par1ItemStack) - { + public boolean isOffensive(ItemStack par1ItemStack) { return true; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java index b1b7cd87448..fee30cbb724 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -11,97 +11,81 @@ import tconstruct.mechworks.logic.TileEntityLandmine; /** - * + * * @author fuj1n - * + * */ -public abstract class SpecialStackHandler -{ +public abstract class SpecialStackHandler { public static ArrayList handlers = new ArrayList(); - public static void registerBuiltInStackHandlers () - { + public static void registerBuiltInStackHandlers() { addSpecialBehavior(new SpecialStackHandlerRocketFireball()); } - public static void addSpecialBehavior (SpecialStackHandler handler) - { - if (!handlers.contains(handler)) - { + public static void addSpecialBehavior(SpecialStackHandler handler) { + if (!handlers.contains(handler)) { handlers.add(handler); } } - public abstract void checkStack (World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks); + public abstract void checkStack( + World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks); - public EnumFacing getFacing (World par1World, int par2, int par3, int par4) - { + public EnumFacing getFacing(World par1World, int par2, int par3, int par4) { ForgeDirection dir = Helper.convertMetaToForgeOrientation(par1World.getBlockMetadata(par2, par3, par4)); - switch (dir) - { - case DOWN: - return EnumFacing.UP; - case UP: - return EnumFacing.DOWN; - case WEST: - return EnumFacing.WEST; - case EAST: - return EnumFacing.EAST; - case SOUTH: - return EnumFacing.NORTH; - case NORTH: - return EnumFacing.SOUTH; - default: - return EnumFacing.UP; + switch (dir) { + case DOWN: + return EnumFacing.UP; + case UP: + return EnumFacing.DOWN; + case WEST: + return EnumFacing.WEST; + case EAST: + return EnumFacing.EAST; + case SOUTH: + return EnumFacing.NORTH; + case NORTH: + return EnumFacing.SOUTH; + default: + return EnumFacing.UP; } } - public final void removeItemFromInventory (World par1World, int x, int y, int z, ItemStack item) - { - if (item == null || item.stackSize <= 0) - { + public final void removeItemFromInventory(World par1World, int x, int y, int z, ItemStack item) { + if (item == null || item.stackSize <= 0) { return; } TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.getTileEntity(x, y, z); - while (item.stackSize > 0) - { + while (item.stackSize > 0) { boolean hasRemovedThisIteration = false; - for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) - { - if (!hasRemovedThisIteration && tileEntity.getStackInSlot(i) != null) - { - if (tileEntity.getStackInSlot(i).isItemEqual(item)) - { + for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) { + if (!hasRemovedThisIteration && tileEntity.getStackInSlot(i) != null) { + if (tileEntity.getStackInSlot(i).isItemEqual(item)) { tileEntity.decrStackSize(i, 1); item.stackSize--; } } - if (!hasRemovedThisIteration && i == tileEntity.getSizeTriggerInventory() - 1) - { + if (!hasRemovedThisIteration && i == tileEntity.getSizeTriggerInventory() - 1) { item.stackSize--; } } } } - public static final int arrayIndexOfStack (ArrayList stacks, ItemStack item) - { + public static final int arrayIndexOfStack(ArrayList stacks, ItemStack item) { return Behavior.arrayIndexOfStack(stacks, item); } - public static final boolean arrayContainsEqualStack (ArrayList stacks, ItemStack item) - { + public static final boolean arrayContainsEqualStack(ArrayList stacks, ItemStack item) { return Behavior.arrayContainsEqualStack(stacks, item); } - public boolean isOffensive (ArrayList par1ArrayList) - { + public boolean isOffensive(ArrayList par1ArrayList) { return true; } - } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index 692b08b344a..598cef0a353 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -9,25 +9,22 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -public class SpecialStackHandlerRocketFireball extends SpecialStackHandler -{ +public class SpecialStackHandlerRocketFireball extends SpecialStackHandler { @Override - public void checkStack (World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks) - { - if (stacks.isEmpty()) - { + public void checkStack( + World par1World, int par2, int par3, int par4, Entity triggerer, ArrayList stacks) { + if (stacks.isEmpty()) { return; } - if (this.arrayContainsEqualStack(stacks, new ItemStack(Items.fireworks)) && this.arrayContainsEqualStack(stacks, new ItemStack(Items.fire_charge))) - { + if (this.arrayContainsEqualStack(stacks, new ItemStack(Items.fireworks)) + && this.arrayContainsEqualStack(stacks, new ItemStack(Items.fire_charge))) { int index0 = this.arrayIndexOfStack(stacks, new ItemStack(Items.fireworks)); int index1 = this.arrayIndexOfStack(stacks, new ItemStack(Items.fire_charge)); EnumFacing face = getFacing(par1World, par2, par3, par4); - while (stacks.get(index0).stackSize > 0 && stacks.get(index1).stackSize > 0) - { + while (stacks.get(index0).stackSize > 0 && stacks.get(index1).stackSize > 0) { double d0 = par2 + (double) ((float) face.getFrontOffsetX() * 0.3F); double d1 = par3 + (double) ((float) face.getFrontOffsetX() * 0.3F); double d2 = par4 + (double) ((float) face.getFrontOffsetZ() * 0.3F); @@ -38,22 +35,18 @@ public void checkStack (World par1World, int par2, int par3, int par4, Entity tr EntityFireball fireball = new EntityLargeFireball(par1World, d0, d1, d2, d3, d4, d5); par1World.spawnEntityInWorld(fireball); - if (triggerer instanceof EntityLivingBase) - { + if (triggerer instanceof EntityLivingBase) { boolean shouldRun = true; - if (triggerer instanceof EntityPlayer) - { + if (triggerer instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) triggerer; - if (player.capabilities.isCreativeMode) - { + if (player.capabilities.isCreativeMode) { // Remove the bellow comment to make the player in // creative mode not get launched // shouldRun = false; } } - if (shouldRun) - { + if (shouldRun) { triggerer.mountEntity(fireball); } } diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index 5cdc6ef16be..67296028e6c 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -10,20 +10,18 @@ /** * This logic is designed only for blocks having TileEntityLandmine as their * tileEntity(otherwise ClassCastException will be awarded) - * + * * @author fuj1n - * + * */ -public class LandmineExplodeLogic -{ +public class LandmineExplodeLogic { private final World worldObj; private final Entity triggerer; private final TileEntityLandmine tileEntity; private final int x, y, z; - public LandmineExplodeLogic(World par1World, int par2, int par3, int par4, Entity entity) - { + public LandmineExplodeLogic(World par1World, int par2, int par3, int par4, Entity entity) { worldObj = par1World; this.tileEntity = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); this.x = par2; @@ -32,10 +30,8 @@ public LandmineExplodeLogic(World par1World, int par2, int par3, int par4, Entit this.triggerer = entity; } - public void explode () - { - if (triggerer == null) - { + public void explode() { + if (triggerer == null) { return; } @@ -46,84 +42,63 @@ public void explode () ArrayList stacks = new ArrayList(); boolean hasExploded = false; - if (tileEntity == null) - { + if (tileEntity == null) { return; } tileEntity.isExploding = true; - for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) - { + for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) { ItemStack currentStack = tileEntity.getStackInSlot(i); Behavior b = Behavior.getBehaviorFromStack(currentStack); - if (b != null) - { + if (b != null) { - if (b.doesBehaviorPreventRemovalOfBlock(currentStack)) - { + if (b.doesBehaviorPreventRemovalOfBlock(currentStack)) { preventExplode = true; } - if (!b.isBehaviorExchangableWithOffensive(currentStack)) - { + if (!b.isBehaviorExchangableWithOffensive(currentStack)) { isOffensive = false; } - if (b.overridesDefault()) - { + if (b.overridesDefault()) { cancelDefault = true; } - if (!stacks.isEmpty() && Behavior.arrayContainsEqualStack(stacks, currentStack) && b.effectStacks()) - { + if (!stacks.isEmpty() && Behavior.arrayContainsEqualStack(stacks, currentStack) && b.effectStacks()) { stacks.get(Behavior.arrayIndexOfStack(stacks, currentStack)).stackSize += currentStack.stackSize; - } - else - { + } else { stacks.add(currentStack.copy()); } } } - LandmineSpecialStackLogic specialStacks = new LandmineSpecialStackLogic(worldObj, x, y, z, triggerer, isOffensive, stacks); + LandmineSpecialStackLogic specialStacks = + new LandmineSpecialStackLogic(worldObj, x, y, z, triggerer, isOffensive, stacks); specialStacks.handleSpecialStacks(); Iterator i1 = stacks.iterator(); - while (i1.hasNext()) - { + while (i1.hasNext()) { ItemStack currentStack = i1.next(); Behavior b = Behavior.getBehaviorFromStack(currentStack); - if (b != null) - { - if (isOffensive || !b.isOffensive(currentStack)) - { + if (b != null) { + if (isOffensive || !b.isOffensive(currentStack)) { b.executeLogic(worldObj, x, y, z, currentStack, triggerer, !preventExplode); - if (b.shouldItemBeRemoved(currentStack, !preventExplode)) - { - if (b.effectStacks()) - { - for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) - { - if (tileEntity.getStackInSlot(i) != null) - { - if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) - { + if (b.shouldItemBeRemoved(currentStack, !preventExplode)) { + if (b.effectStacks()) { + for (int i = 0; i < tileEntity.getSizeTriggerInventory(); i++) { + if (tileEntity.getStackInSlot(i) != null) { + if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) { tileEntity.setInventorySlotContents(i, null); } } } - } - else - { + } else { boolean hasRemoved = false; - for (int i = 0; i < tileEntity.getSizeTriggerInventory() && !hasRemoved; i++) - { - if (tileEntity.getStackInSlot(i) != null) - { - if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) - { + for (int i = 0; i < tileEntity.getSizeTriggerInventory() && !hasRemoved; i++) { + if (tileEntity.getStackInSlot(i) != null) { + if (tileEntity.getStackInSlot(i).isItemEqual(currentStack)) { tileEntity.setInventorySlotContents(i, null); hasRemoved = true; } @@ -136,18 +111,14 @@ public void explode () } Behavior defBeh = Behavior.getDefaulBehavior(); - if (defBeh != null && isOffensive && !cancelDefault) - { + if (defBeh != null && isOffensive && !cancelDefault) { defBeh.executeLogic(worldObj, x, y, z, null, triggerer, !preventExplode); } - if (hasExploded || defBeh != null && !preventExplode) - { + if (hasExploded || defBeh != null && !preventExplode) { worldObj.removeTileEntity(x, y, z); WorldHelper.setBlockToAir(worldObj, x, y, z); - } - else - { + } else { tileEntity.isExploding = false; } } diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java index 832c224dd6f..ae1788abe2f 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java @@ -6,8 +6,7 @@ import net.minecraft.world.World; import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; -public class LandmineSpecialStackLogic -{ +public class LandmineSpecialStackLogic { private final World worldObj; private final Entity triggerer; @@ -16,8 +15,14 @@ public class LandmineSpecialStackLogic private final boolean isOffensive; private final ArrayList stackEffects; - public LandmineSpecialStackLogic(World par1World, int par2, int par3, int par4, Entity entity, boolean mayHurtPlayer, ArrayList items) - { + public LandmineSpecialStackLogic( + World par1World, + int par2, + int par3, + int par4, + Entity entity, + boolean mayHurtPlayer, + ArrayList items) { worldObj = par1World; this.tileEntity = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); this.x = par2; @@ -28,18 +33,14 @@ public LandmineSpecialStackLogic(World par1World, int par2, int par3, int par4, this.stackEffects = items; } - public void handleSpecialStacks () - { + public void handleSpecialStacks() { Iterator i1 = SpecialStackHandler.handlers.iterator(); - while (i1.hasNext()) - { + while (i1.hasNext()) { SpecialStackHandler h = i1.next(); - if (isOffensive || !h.isOffensive(stackEffects)) - { + if (isOffensive || !h.isOffensive(stackEffects)) { h.checkStack(worldObj, x, y, z, triggerer, stackEffects); } } } - } diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index 9b7e1506c5f..bae650888f8 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -9,12 +9,11 @@ import net.minecraft.tileentity.TileEntity; /** - * + * * @author fuj1n - * + * */ -public class TileEntityLandmine extends TileEntity implements IInventory -{ +public class TileEntityLandmine extends TileEntity implements IInventory { private ItemStack[] inventory = new ItemStack[getSizeInventory()]; private String containerName; @@ -27,27 +26,22 @@ public class TileEntityLandmine extends TileEntity implements IInventory public int triggerType; public boolean isExploding = false; - public int getSizeTriggerInventory () - { + public int getSizeTriggerInventory() { return 3; } @Override - public int getSizeInventory () - { + public int getSizeInventory() { return 4; } @Override - public void writeToNBT (NBTTagCompound par1NBTTagCompound) - { + public void writeToNBT(NBTTagCompound par1NBTTagCompound) { super.writeToNBT(par1NBTTagCompound); NBTTagList nbttaglist = new NBTTagList(); - for (int i = 0; i < this.inventory.length; ++i) - { - if (this.inventory[i] != null) - { + for (int i = 0; i < this.inventory.length; ++i) { + if (this.inventory[i] != null) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); nbttagcompound1.setByte("Slot", (byte) i); this.inventory[i].writeToNBT(nbttagcompound1); @@ -59,183 +53,145 @@ public void writeToNBT (NBTTagCompound par1NBTTagCompound) par1NBTTagCompound.setInteger("triggerType", triggerType); - if (this.hasCustomInventoryName()) - { + if (this.hasCustomInventoryName()) { par1NBTTagCompound.setString("CustomName", this.containerName); } } @Override - public void readFromNBT (NBTTagCompound par1NBTTagCompound) - { + public void readFromNBT(NBTTagCompound par1NBTTagCompound) { super.readFromNBT(par1NBTTagCompound); NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items", 10); this.inventory = new ItemStack[this.getSizeInventory()]; - for (int i = 0; i < nbttaglist.tagCount(); ++i) - { + for (int i = 0; i < nbttaglist.tagCount(); ++i) { NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.getCompoundTagAt(i); byte b0 = nbttagcompound1.getByte("Slot"); - if (b0 >= 0 && b0 < this.inventory.length) - { + if (b0 >= 0 && b0 < this.inventory.length) { this.inventory[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); } } triggerType = par1NBTTagCompound.getInteger("triggerType"); - if (par1NBTTagCompound.hasKey("CustomName")) - { + if (par1NBTTagCompound.hasKey("CustomName")) { this.containerName = par1NBTTagCompound.getString("CustomName"); } } @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, nbt); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); } @Override - public ItemStack getStackInSlot (int i) - { - if (i < inventory.length) - { + public ItemStack getStackInSlot(int i) { + if (i < inventory.length) { return inventory[i]; - } - else - { + } else { return null; } } @Override - public ItemStack decrStackSize (int par1, int par2) - { - if (par1 < inventory.length) - { - if (inventory[par1] != null) - { + public ItemStack decrStackSize(int par1, int par2) { + if (par1 < inventory.length) { + if (inventory[par1] != null) { ItemStack itemstack; - if (inventory[par1].stackSize <= par2) - { + if (inventory[par1].stackSize <= par2) { itemstack = inventory[par1]; inventory[par1] = null; return itemstack; - } - else - { + } else { itemstack = inventory[par1].splitStack(par2); - if (inventory[par1].stackSize == 0) - { + if (inventory[par1].stackSize == 0) { inventory[par1] = null; } return itemstack; } - } - else - { + } else { return null; } - } - else - { + } else { return null; } } @Override - public ItemStack getStackInSlotOnClosing (int i) - { - if (i < inventory.length && this.inventory[i] != null) - { + public ItemStack getStackInSlotOnClosing(int i) { + if (i < inventory.length && this.inventory[i] != null) { ItemStack itemstack = this.inventory[i]; this.inventory[i] = null; return itemstack; - } - else - { + } else { return null; } } @Override - public void setInventorySlotContents (int i, ItemStack itemstack) - { - if (i < inventory.length) - { + public void setInventorySlotContents(int i, ItemStack itemstack) { + if (i < inventory.length) { inventory[i] = itemstack; } } @Override - public String getInventoryName () - { + public String getInventoryName() { return this.hasCustomInventoryName() ? this.containerName : "Landmine"; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return containerName != null && containerName.length() > 0; } @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 64; } - public void setGuiDisplayName (String par1Str) - { + public void setGuiDisplayName(String par1Str) { this.containerName = par1Str; } @Override - public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) - { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D; + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this + ? false + : par1EntityPlayer.getDistanceSq( + (double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) + <= 64.0D; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} @Override - public void markDirty () - { + public void markDirty() { super.markDirty(); this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @Override - public boolean isItemValidForSlot (int i, ItemStack itemstack) - { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { // Should automatic camo insertion be allowed. - if (i == 3) - { + if (i == 3) { return false; - } - else - { + } else { // Here for mDiyo to decide if he wants automation for // insertion/extraction of the items to be an option. // Would be useful for building automated mine laying machines. @@ -243,24 +199,19 @@ public boolean isItemValidForSlot (int i, ItemStack itemstack) } } - public void setSoundPlayed () - { + public void setSoundPlayed() { soundcountythingmax = 35; soundcountything = soundcountythingmax; } @Override - public void updateEntity () - { - if (shouldUpdateLogic) - { + public void updateEntity() { + if (shouldUpdateLogic) { worldObj.func_147479_m(xCoord, yCoord, zCoord); shouldUpdateLogic = false; } - if (soundcountything > 0) - { + if (soundcountything > 0) { soundcountything--; } } - } diff --git a/src/main/java/tconstruct/mechworks/model/CartRender.java b/src/main/java/tconstruct/mechworks/model/CartRender.java index 016efb003ae..cb2538df9d6 100644 --- a/src/main/java/tconstruct/mechworks/model/CartRender.java +++ b/src/main/java/tconstruct/mechworks/model/CartRender.java @@ -11,20 +11,17 @@ import tconstruct.world.entity.CartEntity; @SideOnly(Side.CLIENT) -public class CartRender extends Render -{ +public class CartRender extends Render { protected ModelBase modelCart; RenderBlocks renderblocks; - public CartRender() - { + public CartRender() { this.shadowSize = 0.5F; this.modelCart = new ModelPullcart(); renderblocks = new RenderBlocks(); } - public void renderPullcart (CartEntity cart, double posX, double posY, double posZ, float par8, float par9) - { + public void renderPullcart(CartEntity cart, double posX, double posY, double posZ, float par8, float par9) { GL11.glPushMatrix(); long var10 = (long) cart.hashCode() * 493286711L; var10 = var10 * var10 * 4392167121L + var10 * 98761L; @@ -39,18 +36,15 @@ public void renderPullcart (CartEntity cart, double posX, double posY, double po Vec3 var23 = cart.func_70489_a(var15, var17, var19); float var24 = cart.prevRotationPitch + (cart.rotationPitch - cart.prevRotationPitch) * par9; - if (var23 != null) - { + if (var23 != null) { Vec3 var25 = cart.func_70495_a(var15, var17, var19, var21); Vec3 var26 = cart.func_70495_a(var15, var17, var19, -var21); - if (var25 == null) - { + if (var25 == null) { var25 = var23; } - if (var26 == null) - { + if (var26 == null) { var26 = var23; } @@ -59,8 +53,7 @@ public void renderPullcart (CartEntity cart, double posX, double posY, double po posZ += var23.zCoord - var19; Vec3 var27 = var26.addVector(-var25.xCoord, -var25.yCoord, -var25.zCoord); - if (var27.lengthVector() != 0.0D) - { + if (var27.lengthVector() != 0.0D) { var27 = var27.normalize(); par8 = (float) (Math.atan2(var27.zCoord, var27.xCoord) * 180.0D / Math.PI); var24 = (float) (Math.atan(var27.yCoord) * 73.0D); @@ -73,32 +66,30 @@ public void renderPullcart (CartEntity cart, double posX, double posY, double po float var28 = (float) cart.getRollingAmplitude() - par9; float var30 = (float) cart.getDamage() - par9; - if (var30 < 0.0F) - { + if (var30 < 0.0F) { var30 = 0.0F; } - if (var28 > 0.0F) - { - GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.getRollingDirection(), 1.0F, 0.0F, 0.0F); + if (var28 > 0.0F) { + GL11.glRotatef( + MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.getRollingDirection(), + 1.0F, + 0.0F, + 0.0F); } - if (cart.getCartType() != 0) - { + if (cart.getCartType() != 0) { // this.loadTexture("/terrain.png"); float var29 = 0.75F; GL11.glScalef(var29, var29, var29); - if (cart.getCartType() == 1) - { + if (cart.getCartType() == 1) { GL11.glTranslatef(0.0F, 0.5F, 0.0F); renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.5F, 0.0F, -0.5F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - else if (cart.getCartType() == 2) - { + } else if (cart.getCartType() == 2) { GL11.glTranslatef(0.0F, 0.3125F, 0.0F); renderblocks.renderBlockAsItem(Blocks.furnace, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); @@ -124,14 +115,12 @@ else if (cart.getCartType() == 2) * f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.renderPullcart((CartEntity) par1Entity, par2, par4, par6, par8, par9); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return texture; } diff --git a/src/main/java/tconstruct/mechworks/model/ModelPullcart.java b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java index 9ca21fe0129..7301d2aa613 100644 --- a/src/main/java/tconstruct/mechworks/model/ModelPullcart.java +++ b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java @@ -3,8 +3,7 @@ import net.minecraft.client.model.*; import net.minecraft.entity.Entity; -public class ModelPullcart extends ModelBase -{ +public class ModelPullcart extends ModelBase { ModelRenderer BackPanel; ModelRenderer FrontPanel; ModelRenderer RightPanel; @@ -47,8 +46,7 @@ public class ModelPullcart extends ModelBase ModelRenderer WheelLeft11; ModelRenderer WheelLeft12; - public ModelPullcart() - { + public ModelPullcart() { textureWidth = 128; textureHeight = 64; @@ -219,8 +217,7 @@ public ModelPullcart() } @Override - public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); BackPanel.render(f5); @@ -266,17 +263,14 @@ public void render (Entity entity, float f, float f1, float f2, float f3, float WheelLeft12.render(f5); } - private void setRotation (ModelRenderer model, float x, float y, float z) - { + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; } @Override - public void setRotationAngles (float f, float f1, float f2, float f3, float f4, float f5, Entity entity) - { + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } - } diff --git a/src/main/java/tconstruct/mechworks/model/ModelWagon.java b/src/main/java/tconstruct/mechworks/model/ModelWagon.java index 0bfedc5951f..14537d25f51 100644 --- a/src/main/java/tconstruct/mechworks/model/ModelWagon.java +++ b/src/main/java/tconstruct/mechworks/model/ModelWagon.java @@ -3,8 +3,7 @@ import net.minecraft.client.model.*; import net.minecraft.entity.Entity; -public class ModelWagon extends ModelBase -{ +public class ModelWagon extends ModelBase { ModelRenderer Bottom; ModelRenderer Left; ModelRenderer Right; @@ -58,8 +57,7 @@ public class ModelWagon extends ModelBase ModelRenderer StandLeft; ModelRenderer StandRight; - public ModelWagon() - { + public ModelWagon() { this.textureWidth = 128; this.textureHeight = 64; this.Bottom = new ModelRenderer(this, 26, 46); @@ -380,11 +378,74 @@ public ModelWagon() * Sets the models various rotation angles then renders the model. */ @Override - public void render (Entity var1, float var2, float var3, float var4, float var5, float var6, float var7) - { + public void render(Entity var1, float var2, float var3, float var4, float var5, float var6, float var7) { super.render(var1, var2, var3, var4, var5, var6, var7); this.setRotationAngles(var2, var3, var4, var5, var6, var7, var1); - this.LeftWheelAxle.rotateAngleZ = this.LeftWCenterHbeam.rotateAngleZ = this.LeftWCenterVtop.rotateAngleZ = this.LeftWCenterVbottom.rotateAngleZ = this.LeftWnwH.rotateAngleZ = this.LeftWnwM.rotateAngleZ = this.LeftWnwV.rotateAngleZ = this.LeftWnwEye.rotateAngleZ = this.LeftWneH.rotateAngleZ = this.LeftWneM.rotateAngleZ = this.LeftWneV.rotateAngleZ = this.LeftWneEye.rotateAngleZ = this.LeftWswH.rotateAngleZ = this.LeftWswM.rotateAngleZ = this.LeftWswV.rotateAngleZ = this.LeftWswEye.rotateAngleZ = this.LeftWseH.rotateAngleZ = this.LeftWseM.rotateAngleZ = this.LeftWseV.rotateAngleZ = this.LeftWseEye.rotateAngleZ = this.RightWheelAxle.rotateAngleZ = this.RightWCenterHbeam.rotateAngleZ = this.RightWCenterVtop.rotateAngleZ = this.RightWCenterVbottom.rotateAngleZ = this.RightWnwH.rotateAngleZ = this.RightWnwM.rotateAngleZ = this.RightWnwV.rotateAngleZ = this.RightWnwEye.rotateAngleZ = this.RoghtWneH.rotateAngleZ = this.RightWneM.rotateAngleZ = this.RightWneV.rotateAngleZ = this.RightWneEye.rotateAngleZ = this.RightWswH.rotateAngleZ = this.RightWswM.rotateAngleZ = this.RightWswV.rotateAngleZ = this.RightWswEye.rotateAngleZ = this.RightWseH.rotateAngleZ = this.RightWseM.rotateAngleZ = this.RightWseV.rotateAngleZ = this.RightWseEye.rotateAngleZ; + this.LeftWheelAxle.rotateAngleZ = this.LeftWCenterHbeam.rotateAngleZ = this.LeftWCenterVtop.rotateAngleZ = + this.LeftWCenterVbottom.rotateAngleZ = this.LeftWnwH.rotateAngleZ = this.LeftWnwM.rotateAngleZ = + this.LeftWnwV.rotateAngleZ = this.LeftWnwEye.rotateAngleZ = this.LeftWneH.rotateAngleZ = + this.LeftWneM.rotateAngleZ = this.LeftWneV.rotateAngleZ = this.LeftWneEye.rotateAngleZ = + this.LeftWswH.rotateAngleZ = this.LeftWswM.rotateAngleZ = + this.LeftWswV.rotateAngleZ = this.LeftWswEye.rotateAngleZ = + this.LeftWseH.rotateAngleZ = this.LeftWseM.rotateAngleZ = + this.LeftWseV.rotateAngleZ = + this.LeftWseEye.rotateAngleZ = + this.RightWheelAxle.rotateAngleZ = + this.RightWCenterHbeam + .rotateAngleZ = + this.RightWCenterVtop + .rotateAngleZ = + this + .RightWCenterVbottom + .rotateAngleZ = + this + .RightWnwH + .rotateAngleZ = + this + .RightWnwM + .rotateAngleZ = + this + .RightWnwV + .rotateAngleZ = + this + .RightWnwEye + .rotateAngleZ = + this + .RoghtWneH + .rotateAngleZ = + this + .RightWneM + .rotateAngleZ = + this + .RightWneV + .rotateAngleZ = + this + .RightWneEye + .rotateAngleZ = + this + .RightWswH + .rotateAngleZ = + this + .RightWswM + .rotateAngleZ = + this + .RightWswV + .rotateAngleZ = + this + .RightWswEye + .rotateAngleZ = + this + .RightWseH + .rotateAngleZ = + this + .RightWseM + .rotateAngleZ = + this + .RightWseV + .rotateAngleZ = + this + .RightWseEye + .rotateAngleZ; this.Bottom.render(var7); this.Left.render(var7); this.Right.render(var7); @@ -439,8 +500,7 @@ public void render (Entity var1, float var2, float var3, float var4, float var5, this.StandRight.render(var7); } - private void setRotation (ModelRenderer var1, float var2, float var3, float var4) - { + private void setRotation(ModelRenderer var1, float var2, float var3, float var4) { var1.rotateAngleX = var2; var1.rotateAngleY = var3; var1.rotateAngleZ = var4; @@ -450,8 +510,8 @@ private void setRotation (ModelRenderer var1, float var2, float var3, float var4 * Sets the models various rotation angles. */ @Override - public void setRotationAngles (float var1, float var2, float var3, float var4, float var5, float var6, Entity par7Entity) - { + public void setRotationAngles( + float var1, float var2, float var3, float var4, float var5, float var6, Entity par7Entity) { super.setRotationAngles(var1, var2, var3, var4, var5, var6, par7Entity); } } diff --git a/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java b/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java index ec09b8cda66..9a8a08ad982 100644 --- a/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java +++ b/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java @@ -6,24 +6,20 @@ /* Adds a boolean NBTTag */ -public class GloveClimb extends ItemModifier -{ +public class GloveClimb extends ItemModifier { - public GloveClimb(ItemStack[] items) - { + public GloveClimb(ItemStack[] items) { super(items, 3, "WallClimb"); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("TinkerAccessory"); return tags.getInteger("Modifiers") >= 3 && !tags.getBoolean(key); } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("TinkerAccessory"); tags.setBoolean(key, true); diff --git a/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java b/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java index 8b3b1d30198..f469559d75c 100644 --- a/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java +++ b/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java @@ -1,61 +1,49 @@ package tconstruct.modifiers.accessory; +import java.util.Arrays; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; import tconstruct.library.accessory.AccessoryCore; import tconstruct.library.modifier.IModifyable; import tconstruct.modifiers.tools.ItemModTypeFilter; -import java.util.Arrays; - -public class GloveSpeed extends ItemModTypeFilter -{ +public class GloveSpeed extends ItemModTypeFilter { String tooltipName; int max = 100; - public GloveSpeed(int effect, ItemStack[] items, int[] values) - { + public GloveSpeed(int effect, ItemStack[] items, int[] values) { super(effect, "Redstone", items, values); tooltipName = ("\u00a74" + StatCollector.translateToLocal("modifier.tooltip.Haste")); } @Override - protected boolean canModify (ItemStack input, ItemStack[] modifiers) - { - if (input.getItem() instanceof AccessoryCore) - { + protected boolean canModify(ItemStack input, ItemStack[] modifiers) { + if (input.getItem() instanceof AccessoryCore) { // is glove? - if(!Arrays.asList(((AccessoryCore) input.getItem()).getTraits()).contains("glove")) - return false; + if (!Arrays.asList(((AccessoryCore) input.getItem()).getTraits()).contains("glove")) return false; NBTTagCompound tags = getModifierTag(input); if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(modifiers) <= max;//This line fails? + return tags.getInteger("Modifiers") > 0 && matchingAmount(modifiers) <= max; // This line fails? int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(modifiers) <= keyPair[1]) - return true; - - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; + if (keyPair[0] + matchingAmount(modifiers) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; } return false; } @Override - public void modify (ItemStack[] modifiers, ItemStack input) - { + public void modify(ItemStack[] modifiers, ItemStack input) { NBTTagCompound tags = getModifierTag(input); int[] keyPair; int increase = matchingAmount(modifiers); int current = 0; - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -63,23 +51,19 @@ public void modify (ItemStack[] modifiers, ItemStack input) int mods = tags.getInteger("Modifiers"); mods -= 1; tags.setInteger("Modifiers", mods); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } current = keyPair[0]; updateModTag(input, keyPair); - } - else - { + } else { int mods = tags.getInteger("Modifiers"); mods -= 1; tags.setInteger("Modifiers", mods); String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(input, tooltipName, modName); - keyPair = new int[] { increase, max, tooltipIndex }; + keyPair = new int[] {increase, max, tooltipIndex}; current = keyPair[0]; tags.setIntArray(key, keyPair); } @@ -91,8 +75,7 @@ public void modify (ItemStack[] modifiers, ItemStack input) tags.setInteger("MiningSpeed", miningSpeed); } - void updateModTag (ItemStack input, int[] keys) - { + void updateModTag(ItemStack input, int[] keys) { NBTTagCompound tags = getModifierTag(input); String tip = "ModifierTip" + keys[2]; String modName = "\u00a74Redstone (" + keys[0] + "/" + keys[1] + ")"; @@ -100,8 +83,7 @@ void updateModTag (ItemStack input, int[] keys) } @Override - public boolean validType (IModifyable type) - { + public boolean validType(IModifyable type) { return type.getModifyType().equals("Accessory"); } } diff --git a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java index dd5a8730f16..de0d5f0c805 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java +++ b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java @@ -7,34 +7,29 @@ /* Adds a boolean NBTTag */ -public class AModBoolean extends ArmorMod -{ +public class AModBoolean extends ArmorMod { String color; String tooltipName; - public AModBoolean(int effect, String tag, EnumSet armorTypes, ItemStack[] items, String c, String tip) - { + public AModBoolean(int effect, String tag, EnumSet armorTypes, ItemStack[] items, String c, String tip) { super(effect, tag, armorTypes, items); color = c; tooltipName = tip; } @Override - protected boolean canModify (ItemStack armor, ItemStack[] recipe) - { + protected boolean canModify(ItemStack armor, ItemStack[] recipe) { Item i = armor.getItem(); - if (!(i instanceof ArmorCore)) - return false; + if (!(i instanceof ArmorCore)) return false; ArmorCore item = (ArmorCore) armor.getItem(); - if (!armorTypes.contains(item.armorPart)) - return false; + if (!armorTypes.contains(item.armorPart)) return false; NBTTagCompound tags = getModifierTag(armor); - return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); //Will fail if the modifier is false or the tag doesn't exist + return tags.getInteger("Modifiers") > 0 + && !tags.getBoolean(key); // Will fail if the modifier is false or the tag doesn't exist } @Override - public void modify (ItemStack[] recipe, ItemStack input) - { + public void modify(ItemStack[] recipe, ItemStack input) { NBTTagCompound tags = getModifierTag(input); tags.setBoolean(key, true); diff --git a/src/main/java/tconstruct/modifiers/armor/AModInteger.java b/src/main/java/tconstruct/modifiers/armor/AModInteger.java index c3410039ef5..964a908372a 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModInteger.java +++ b/src/main/java/tconstruct/modifiers/armor/AModInteger.java @@ -7,23 +7,35 @@ /* Adds an integer NBTTag */ -public class AModInteger extends ArmorMod -{ +public class AModInteger extends ArmorMod { String color; String tooltipName; int initialIncrease; int secondaryIncrease; - public AModInteger(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int increase, String c, String tip) - { + public AModInteger( + int effect, + String dataKey, + EnumSet armorTypes, + ItemStack[] items, + int increase, + String c, + String tip) { super(effect, dataKey, armorTypes, items); initialIncrease = secondaryIncrease = increase; color = c; tooltipName = tip; } - public AModInteger(int effect, String dataKey, EnumSet armorTypes, ItemStack[] items, int increase1, int increase2, String c, String tip) - { + public AModInteger( + int effect, + String dataKey, + EnumSet armorTypes, + ItemStack[] items, + int increase1, + int increase2, + String c, + String tip) { super(effect, dataKey, armorTypes, items); initialIncrease = increase1; secondaryIncrease = increase2; @@ -32,17 +44,13 @@ public AModInteger(int effect, String dataKey, EnumSet armorTypes, It } @Override - public void modify (ItemStack[] recipe, ItemStack input) - { + public void modify(ItemStack[] recipe, ItemStack input) { NBTTagCompound tags = getModifierTag(input); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int increase = tags.getInteger(key); increase += secondaryIncrease; tags.setInteger(key, increase); - } - else - { + } else { tags.setInteger(key, initialIncrease); } @@ -52,5 +60,4 @@ public void modify (ItemStack[] recipe, ItemStack input) addToolTip(input, color + tooltipName, color + key); } - } diff --git a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java index 58146d29c47..88ac721d0d6 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java +++ b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java @@ -5,17 +5,14 @@ import net.minecraft.nbt.*; import tconstruct.library.armor.ArmorPart; -public class AModLeadBoots extends AModBoolean -{ +public class AModLeadBoots extends AModBoolean { - public AModLeadBoots(ItemStack[] items) - { + public AModLeadBoots(ItemStack[] items) { super(2, "LeadBoots", EnumSet.of(ArmorPart.Feet), items, "\u00a78", "Lead Boots"); } @Override - public void modify (ItemStack[] recipe, ItemStack armor) - { + public void modify(ItemStack[] recipe, ItemStack armor) { NBTTagCompound baseTag = armor.getTagCompound(); NBTTagCompound armorTag = armor.getTagCompound().getCompoundTag(getTagName(armor)); @@ -28,18 +25,13 @@ public void modify (ItemStack[] recipe, ItemStack armor) addToolTip(armor, color + tooltipName, color + key); NBTTagList attributes; - if (baseTag.hasKey("AttributeModifiers")) - { + if (baseTag.hasKey("AttributeModifiers")) { attributes = baseTag.getTagList("AttributeModifiers", 0); - for (int iter = 0; iter < attributes.tagCount(); iter++) - { + for (int iter = 0; iter < attributes.tagCount(); iter++) { NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter); - if (tag.getString("AttributeName").equals("generic.knockbackResistance")) - attributes.removeTag(iter); + if (tag.getString("AttributeName").equals("generic.knockbackResistance")) attributes.removeTag(iter); } - } - else - { + } else { attributes = new NBTTagList(); baseTag.setTag("AttributeModifiers", attributes); } diff --git a/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java b/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java index ebc0b2e0c57..3330c6ebdd8 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java +++ b/src/main/java/tconstruct/modifiers/armor/AModThaumicVision.java @@ -1,5 +1,6 @@ package tconstruct.modifiers.armor; +import java.util.EnumSet; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -8,10 +9,6 @@ import tconstruct.library.armor.ArmorMod; import tconstruct.library.armor.ArmorPart; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.Iterator; - public class AModThaumicVision extends ArmorMod { private final AModBoolean thaumicSensesMod; private final AModBoolean thaumicVisionMod; @@ -19,12 +16,25 @@ public class AModThaumicVision extends ArmorMod { private final Item thaumometer; public AModThaumicVision(ItemStack thaumometer) { - super(-1, "", EnumSet.of(ArmorPart.Head), new ItemStack[]{thaumometer}); - //super(effect, "Thaumic Vision", EnumSet.of(ArmorPart.Head), new ItemStack[]{}, EnumChatFormatting.DARK_PURPLE.toString(), "Thaumic Vision"); + super(-1, "", EnumSet.of(ArmorPart.Head), new ItemStack[] {thaumometer}); + // super(effect, "Thaumic Vision", EnumSet.of(ArmorPart.Head), new ItemStack[]{}, + // EnumChatFormatting.DARK_PURPLE.toString(), "Thaumic Vision"); this.thaumometer = thaumometer.getItem(); - thaumicSensesMod = new AModBoolean(1, "Thaumic Senses", EnumSet.of(ArmorPart.Head), new ItemStack[0], EnumChatFormatting.DARK_PURPLE.toString(), "Thaumic Senses"); - thaumicVisionMod = new AModBoolean(2, "Thaumic Vision", EnumSet.of(ArmorPart.Head), new ItemStack[0], EnumChatFormatting.DARK_PURPLE.toString(), "Thaumic Vision"); + thaumicSensesMod = new AModBoolean( + 1, + "Thaumic Senses", + EnumSet.of(ArmorPart.Head), + new ItemStack[0], + EnumChatFormatting.DARK_PURPLE.toString(), + "Thaumic Senses"); + thaumicVisionMod = new AModBoolean( + 2, + "Thaumic Vision", + EnumSet.of(ArmorPart.Head), + new ItemStack[0], + EnumChatFormatting.DARK_PURPLE.toString(), + "Thaumic Vision"); } @Override @@ -37,10 +47,9 @@ protected boolean canModify(ItemStack armor, ItemStack[] recipe) { public void modify(ItemStack[] recipe, ItemStack input) { int effect = -1; int count = countThaumometers(recipe); - if(thaumicSensesMod.canModify(input, recipe)) { + if (thaumicSensesMod.canModify(input, recipe)) { // if we add the thaumic vision too, we need to add the graphical effect for the senses too - if(count > 1) - thaumicSensesMod.addMatchingEffect(input); + if (count > 1) thaumicSensesMod.addMatchingEffect(input); thaumicSensesMod.modify(recipe, input); count--; // one thaumometer used up @@ -48,11 +57,13 @@ public void modify(ItemStack[] recipe, ItemStack input) { } // if we still have 1 thaumometer left, we apply vision - if(count > 0) - { + if (count > 0) { // step 1: remove the thaumic senses tooltip // we re-add the tooltip to find out its index - int tipNum = addToolTip(input, thaumicSensesMod.color + thaumicSensesMod.tooltipName, thaumicSensesMod.color + thaumicSensesMod.key); + int tipNum = addToolTip( + input, + thaumicSensesMod.color + thaumicSensesMod.tooltipName, + thaumicSensesMod.color + thaumicSensesMod.key); // and now we kill it \o/ NBTTagCompound tipTags = input.getTagCompound().getCompoundTag(getTagName(input)); tipTags.removeTag("Tooltip" + tipNum); @@ -62,7 +73,8 @@ public void modify(ItemStack[] recipe, ItemStack input) { NBTTagCompound tags = getModifierTag(input); tags.setInteger("Modifiers", tags.getInteger("Modifiers") + 1); - // step 3: we simply apply thaumic vision now. it should replace the just removed tooltip and the just added modifier + // step 3: we simply apply thaumic vision now. it should replace the just removed tooltip and the just added + // modifier thaumicVisionMod.modify(recipe, input); effect = thaumicVisionMod.effectIndex; @@ -71,46 +83,42 @@ public void modify(ItemStack[] recipe, ItemStack input) { // fix the effect display NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); int i = 1; - for(; i <= 6; i++) - if(tags.getInteger("Effect" + i) == -1) - { + for (; i <= 6; i++) + if (tags.getInteger("Effect" + i) == -1) { tags.setInteger("Effect" + i, effect); break; } } - private boolean hasThaumicSenses(ItemStack stack) - { - return stack != null && stack.hasTagCompound() && stack.getTagCompound().getCompoundTag(TinkerArmor.travelGoggles.getBaseTagName()).getBoolean(thaumicSensesMod.key); + private boolean hasThaumicSenses(ItemStack stack) { + return stack != null + && stack.hasTagCompound() + && stack.getTagCompound() + .getCompoundTag(TinkerArmor.travelGoggles.getBaseTagName()) + .getBoolean(thaumicSensesMod.key); } - public boolean matches (ItemStack[] recipe, ItemStack input) - { - if (!canModify(input, recipe)) - return false; + public boolean matches(ItemStack[] recipe, ItemStack input) { + if (!canModify(input, recipe)) return false; // check how many thaumometers there are int count = countThaumometers(recipe); // none? what are you doing! // more than 2? HOW MANY EYES DO YOU HAVE? - if(count == 0 || count > 2) - return false; + if (count == 0 || count > 2) return false; // one? np since we can modify - if(count == 1) - return true; + if (count == 1) return true; // 2 thaumometers.. only ok if it has no senses return !hasThaumicSenses(input); } - private int countThaumometers(ItemStack[] recipe) - { + private int countThaumometers(ItemStack[] recipe) { int count = 0; - for(ItemStack stack : recipe) { - if(stack != null && stack.getItem() == thaumometer) - count++; + for (ItemStack stack : recipe) { + if (stack != null && stack.getItem() == thaumometer) count++; } return count; } diff --git a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java index 06f2a01a594..1a437e39b39 100644 --- a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java +++ b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java @@ -10,22 +10,17 @@ import tconstruct.library.armor.*; import tconstruct.library.modifier.*; -public class ActiveTinkerArmor extends ActiveArmorMod -{ +public class ActiveTinkerArmor extends ActiveArmorMod { @Override - public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) - { - if(!itemStack.hasTagCompound()) - return; - NBTTagCompound tag = itemStack.getTagCompound().getCompoundTag(((IModifyable) itemStack.getItem()).getBaseTagName()); - if(tag == null) - return; - if (tag.hasKey("Moss")) - { + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) { + if (!itemStack.hasTagCompound()) return; + NBTTagCompound tag = + itemStack.getTagCompound().getCompoundTag(((IModifyable) itemStack.getItem()).getBaseTagName()); + if (tag == null) return; + if (tag.hasKey("Moss")) { int chance = tag.getInteger("Moss"); int check = world.canBlockSeeTheSky((int) player.posX, (int) player.posY, (int) player.posZ) ? 350 : 1150; - if (TConstruct.random.nextInt(check) < chance) - { + if (TConstruct.random.nextInt(check) < chance) { int current = tag.getInteger("Damage"); if (current > 0) { current--; @@ -34,11 +29,9 @@ public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack, } } } - if (type == ArmorPart.Head) - { + if (type == ArmorPart.Head) { TPlayerStats stats = TPlayerStats.get(player); - if (stats.activeGoggles) - { + if (stats.activeGoggles) { if (tag.getBoolean("Night Vision")) player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0, true)); } @@ -50,8 +43,7 @@ public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack, entity.onCollideWithPlayer(player); }*/ } - if (type == ArmorPart.Chest) - { + if (type == ArmorPart.Chest) { if (player.isSneaking() && tag.getBoolean("Stealth")) player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 2, 0, true)); @@ -59,20 +51,14 @@ public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack, if (player.isSprinting() && sprintboost > 0) player.moveEntityWithHeading(-player.moveStrafing * 0.1f * sprintboost, player.moveForward * 0.2F * sprintboost); //Max of 0-1*/ } - if (type == ArmorPart.Feet) - { - if (player.isInWater()) - { - if (!player.isSneaking() && tag.getBoolean("WaterWalk") && player.motionY <= 0) - { + if (type == ArmorPart.Feet) { + if (player.isInWater()) { + if (!player.isSneaking() && tag.getBoolean("WaterWalk") && player.motionY <= 0) { player.motionY = 0; } - if (tag.getBoolean("LeadBoots")) - { - if (player.motionY > 0) - player.motionY *= 0.5f; - else if (player.motionY < 0) - player.motionY *= 1.5f; + if (tag.getBoolean("LeadBoots")) { + if (player.motionY > 0) player.motionY *= 0.5f; + else if (player.motionY < 0) player.motionY *= 1.5f; } } } diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java index eb98b068ebc..ee03fc16957 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java @@ -6,35 +6,28 @@ import tconstruct.library.armor.*; import tconstruct.library.modifier.IModifyable; -public class TravelModDoubleJump extends ArmorMod -{ +public class TravelModDoubleJump extends ArmorMod { String color = "\u00a77"; String tooltipName = "Double-Jump"; - public TravelModDoubleJump(EnumSet armorTypes, ItemStack[] items) - { + public TravelModDoubleJump(EnumSet armorTypes, ItemStack[] items) { super(0, "Double-Jump", armorTypes, items); } @Override - public boolean validType (IModifyable type) - { + public boolean validType(IModifyable type) { return type.getModifyType().equals("Clothing"); } @Override - public void modify (ItemStack[] recipe, ItemStack input) - { + public void modify(ItemStack[] recipe, ItemStack input) { NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input)); int amount = 1; - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int increase = tags.getInteger(key); increase += 1; tags.setInteger(key, increase); - } - else - { + } else { tags.setInteger(key, amount); } @@ -46,26 +39,20 @@ public void modify (ItemStack[] recipe, ItemStack input) } @Override - protected int addToolTip (ItemStack tool, String tooltip, String modifierTip) - { + protected int addToolTip(ItemStack tool, String tooltip, String modifierTip) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag(getTagName(tool)); int tipNum = 0; - while (true) - { + while (true) { tipNum++; String tip = "Tooltip" + tipNum; - if (!tags.hasKey(tip)) - { + if (!tags.hasKey(tip)) { tags.setString(tip, tooltip); String modTip = "ModifierTip" + tipNum; tags.setString(modTip, modifierTip); return tipNum; - } - else - { + } else { String tag = tags.getString(tip); - if (tag.contains("Double-Jump") || tag.contains("Triple-Jump")) - { + if (tag.contains("Double-Jump") || tag.contains("Triple-Jump")) { tags.setString(tip, getProperName(tooltip, tag)); String modTip = "ModifierTip" + tipNum; tag = tags.getString(modTip); @@ -77,22 +64,16 @@ protected int addToolTip (ItemStack tool, String tooltip, String modifierTip) } @Override - protected String getProperName (String tooltip, String tag) - { - if (tag.contains("Double-Jump")) - return color + "Triple-Jump"; + protected String getProperName(String tooltip, String tag) { + if (tag.contains("Double-Jump")) return color + "Triple-Jump"; - if (tag.contains("Triple-Jump")) - return color + "Quadruple-Jump"; + if (tag.contains("Triple-Jump")) return color + "Quadruple-Jump"; - if (tag.contains("Quadruple-Jump")) - return color + "Quintuple-Jump"; + if (tag.contains("Quadruple-Jump")) return color + "Quintuple-Jump"; - if (tag.contains("Quintuple-Jump")) - return color + "Sextuple-Jump"; + if (tag.contains("Quintuple-Jump")) return color + "Sextuple-Jump"; - if (tag.contains("Sextuple-Jump")) - return color + "Septuple-Jump"; + if (tag.contains("Sextuple-Jump")) return color + "Septuple-Jump"; return color + "Double-Jump"; } diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java index 5750cc0c335..06d7b14eb59 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java @@ -6,41 +6,31 @@ import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; -public class TravelModRepair extends ItemModifier -{ +public class TravelModRepair extends ItemModifier { - public TravelModRepair() - { + public TravelModRepair() { super(new ItemStack[0], 0, ""); } @Override - public boolean matches (ItemStack[] recipe, ItemStack input) - { + public boolean matches(ItemStack[] recipe, ItemStack input) { return canModify(input, recipe); } @Override - protected boolean canModify (ItemStack input, ItemStack[] recipe) - { - if (input.getItem() instanceof TravelGear) - { + protected boolean canModify(ItemStack input, ItemStack[] recipe) { + if (input.getItem() instanceof TravelGear) { TravelGear gear = (TravelGear) input.getItem(); NBTTagCompound tags = input.getTagCompound().getCompoundTag(gear.getBaseTagName()); int damage = tags.getInteger("Damage"); - if (damage > 0) - { + if (damage > 0) { boolean validOutput = true; int outputs = 0; - for (ItemStack curInput : recipe) - { - if (curInput == null) - continue; - - if (areItemStacksEquivalent(curInput, gear.getRepairMaterial(input))) - outputs++; - else - validOutput = false; + for (ItemStack curInput : recipe) { + if (curInput == null) continue; + + if (areItemStacksEquivalent(curInput, gear.getRepairMaterial(input))) outputs++; + else validOutput = false; } return validOutput && outputs > 0; } @@ -48,35 +38,29 @@ protected boolean canModify (ItemStack input, ItemStack[] recipe) return false; } - private int calculateIncrease (ItemStack tool, NBTTagCompound tags, int materialValue, int itemsUsed) - { + private int calculateIncrease(ItemStack tool, NBTTagCompound tags, int materialValue, int itemsUsed) { int damage = tags.getInteger("Damage"); int dur = tags.getInteger("BaseDurability"); int increase = (int) (50 * itemsUsed + (dur * 0.4f * materialValue)); int modifiers = tags.getInteger("Modifiers"); float mods = 1.0f; - if (modifiers == 2) - mods = 0.9f; - else if (modifiers == 1) - mods = 0.8f; - else if (modifiers == 0) - mods = 0.7f; + if (modifiers == 2) mods = 0.9f; + else if (modifiers == 1) mods = 0.8f; + else if (modifiers == 0) mods = 0.7f; increase *= mods; int repair = tags.getInteger("RepairCount"); float repairCount = (100 - repair) / 100f; - if (repairCount < 0.5f) - repairCount = 0.5f; + if (repairCount < 0.5f) repairCount = 0.5f; increase *= repairCount; - //increase /= ((ToolCore) tool.getItem()).getRepairCost(); + // increase /= ((ToolCore) tool.getItem()).getRepairCost(); return increase; } @Override - public void modify (ItemStack[] recipe, ItemStack input) - { + public void modify(ItemStack[] recipe, ItemStack input) { TravelGear gear = (TravelGear) input.getItem(); NBTTagCompound tags = input.getTagCompound().getCompoundTag(gear.getBaseTagName()); tags.setBoolean("Broken", false); @@ -85,10 +69,8 @@ public void modify (ItemStack[] recipe, ItemStack input) int itemsUsed = 0; int materialValue = 0; - for (ItemStack modify : recipe) - { - if (modify != null) - { + for (ItemStack modify : recipe) { + if (modify != null) { materialValue += 2; itemsUsed++; } @@ -100,16 +82,14 @@ public void modify (ItemStack[] recipe, ItemStack input) tags.setInteger("RepairCount", repair); damage -= increase; - if (damage < 0) - damage = 0; + if (damage < 0) damage = 0; tags.setInteger("Damage", damage); input.setItemDamage(damage); } @Override - public void addMatchingEffect (ItemStack tool) - { - //Nope + public void addMatchingEffect(ItemStack tool) { + // Nope } @Override diff --git a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java index 7e835c39c52..7fb67c2864f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java +++ b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java @@ -4,84 +4,60 @@ import net.minecraft.item.ItemStack; import tconstruct.library.modifier.ItemModifier; -public abstract class ItemModTypeFilter extends ItemModifier -{ +public abstract class ItemModTypeFilter extends ItemModifier { public final List increase; - public ItemModTypeFilter(int effect, String dataKey, ItemStack[] items, int[] values) - { + public ItemModTypeFilter(int effect, String dataKey, ItemStack[] items, int[] values) { super(items, effect, dataKey); assert items.length == values.length : "Itemstacks and their values for tool modifiers must be the same length"; this.increase = new ArrayList(); - for (int i = 0; i < values.length; i++) - { + for (int i = 0; i < values.length; i++) { increase.add(values[i]); } } /** Checks to see if the inputs match the stored items * Note: Filters types, doesn't care about amount - * + * * @param input The ItemStacks to compare against * @param tool Item to modify, used for restrictions * @return Whether the recipe matches the input */ @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { - if (!canModify(tool, input)) - return false; + public boolean matches(ItemStack[] input, ItemStack tool) { + if (!canModify(tool, input)) return false; boolean minimumMatch = false; - for (ItemStack inputStack : input) - { - if (inputStack == null) - continue; + for (ItemStack inputStack : input) { + if (inputStack == null) continue; boolean match = false; - for (Object check : stacks) - { + for (Object check : stacks) { ItemStack stack = (ItemStack) check; - if (stack.getItemDamage() == Short.MAX_VALUE) - { - if (this.areItemsEquivalent(inputStack, stack)) - match = true; - } - else - { - if (this.areItemStacksEquivalent(inputStack, stack)) - match = true; + if (stack.getItemDamage() == Short.MAX_VALUE) { + if (this.areItemsEquivalent(inputStack, stack)) match = true; + } else { + if (this.areItemStacksEquivalent(inputStack, stack)) match = true; } } - if (!match) - return false; + if (!match) return false; minimumMatch = true; } return minimumMatch; } - public int matchingAmount (ItemStack[] input) - { + public int matchingAmount(ItemStack[] input) { int amount = 0; - for (ItemStack inputStack : input) - { - if (inputStack == null) - continue; - else - { - for (int iter = 0; iter < stacks.size(); iter++) - { + for (ItemStack inputStack : input) { + if (inputStack == null) continue; + else { + for (int iter = 0; iter < stacks.size(); iter++) { ItemStack stack = (ItemStack) stacks.get(iter); - if (stack.getItemDamage() == Short.MAX_VALUE) - { - if (this.areItemsEquivalent(inputStack, stack)) - amount += increase.get(iter); - } - else - { - if (this.areItemStacksEquivalent(inputStack, stack)) - amount += increase.get(iter); + if (stack.getItemDamage() == Short.MAX_VALUE) { + if (this.areItemsEquivalent(inputStack, stack)) amount += increase.get(iter); + } else { + if (this.areItemStacksEquivalent(inputStack, stack)) amount += increase.get(iter); } } } @@ -90,14 +66,14 @@ public int matchingAmount (ItemStack[] input) } /** Adds a new itemstack to the list for increases - * + * * @param stack ItemStack to compare against * @param amount Amount to increase */ - public void addStackToMatchList (ItemStack stack, int amount) - { + public void addStackToMatchList(ItemStack stack, int amount) { if (stack == null) - throw new NullPointerException("ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); + throw new NullPointerException( + "ItemStack added to " + this.getClass().getSimpleName() + " cannot be null."); stacks.add(stack); increase.add(amount); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java index 91a44a95020..ec6fdfd9513 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAmmoRestock.java @@ -1,42 +1,35 @@ package tconstruct.modifiers.tools; +import java.util.HashSet; +import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.AbilityHelper; import tconstruct.library.tools.ToolCore; import tconstruct.library.weaponry.AmmoItem; import tconstruct.library.weaponry.IAmmo; import tconstruct.weaponry.weapons.Shuriken; -import java.util.HashSet; -import java.util.Set; - public class ModAmmoRestock extends ItemModifier { - public ModAmmoRestock() - { + public ModAmmoRestock() { super(new ItemStack[0], 0, ""); } @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { + public boolean matches(ItemStack[] input, ItemStack tool) { return canModify(tool, input); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if(!(tool.getItem() instanceof AmmoItem)) - return false; + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (!(tool.getItem() instanceof AmmoItem)) return false; - IAmmo ammo = (IAmmo)tool.getItem(); + IAmmo ammo = (IAmmo) tool.getItem(); // full? - if(ammo.getAmmoCount(tool) >= ammo.getMaxAmmo(tool)) - return false; + if (ammo.getAmmoCount(tool) >= ammo.getMaxAmmo(tool)) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); // correct material? @@ -44,17 +37,15 @@ protected boolean canModify (ItemStack tool, ItemStack[] input) Set materials = new HashSet(); materials.add(tags.getInteger("Head")); // shuriken allow all their components - if(tool.getItem() instanceof Shuriken) { + if (tool.getItem() instanceof Shuriken) { materials.add(tags.getInteger("Handle")); materials.add(tags.getInteger("Accessory")); materials.add(tags.getInteger("Extra")); } boolean areInputsValid = true; - for (ItemStack curInput : input) - { - if (curInput != null && !materials.contains(PatternBuilder.instance.getPartID(curInput))) - { + for (ItemStack curInput : input) { + if (curInput != null && !materials.contains(PatternBuilder.instance.getPartID(curInput))) { areInputsValid = false; break; } @@ -63,43 +54,35 @@ protected boolean canModify (ItemStack tool, ItemStack[] input) return areInputsValid; } - private int calculateIncrease (ItemStack tool, int materialValue, int itemsUsed) - { + private int calculateIncrease(ItemStack tool, int materialValue, int itemsUsed) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - float dur = tags.getInteger("BaseDurability") * ((AmmoItem)tool.getItem()).getAmmoModifier(); - float increase = (5 * itemsUsed + (dur * 0.4f * materialValue/2f)); + float dur = tags.getInteger("BaseDurability") * ((AmmoItem) tool.getItem()).getAmmoModifier(); + float increase = (5 * itemsUsed + (dur * 0.4f * materialValue / 2f)); int modifiers = tags.getInteger("Modifiers"); float mods = 1.0f; - if (modifiers == 2) - mods = 0.9f; - else if (modifiers == 1) - mods = 0.8f; - else if (modifiers == 0) - mods = 0.7f; + if (modifiers == 2) mods = 0.9f; + else if (modifiers == 1) mods = 0.8f; + else if (modifiers == 0) mods = 0.7f; increase *= mods; int repair = tags.getInteger("RepairCount"); float repairCount = (100 - repair) / 100f; - if (repairCount < 0.5f) - repairCount = 0.5f; + if (repairCount < 0.5f) repairCount = 0.5f; increase *= repairCount; increase /= ((ToolCore) tool.getItem()).getRepairCost(); - return (int)increase; + return (int) increase; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int itemsUsed = 0; int materialValue = 0; - for (ItemStack curInput : input) - { - if (curInput != null) - { + for (ItemStack curInput : input) { + if (curInput != null) { materialValue += PatternBuilder.instance.getPartValue(curInput); itemsUsed++; } @@ -110,16 +93,13 @@ public void modify (ItemStack[] input, ItemStack tool) repair += itemsUsed; tags.setInteger("RepairCount", repair); - ((IAmmo)tool.getItem()).addAmmo(increase, tool); + ((IAmmo) tool.getItem()).addAmmo(increase, tool); } @Override - public void addMatchingEffect (ItemStack tool) - { - } + public void addMatchingEffect(ItemStack tool) {} - public boolean validType (IModifyable input) - { + public boolean validType(IModifyable input) { return input.getModifyType().equals("Tool") || input.getModifyType().equals("Armor"); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java index a0efc37ee12..d3394830cac 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java @@ -3,51 +3,38 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class ModAntiSpider extends ItemModTypeFilter -{ +public class ModAntiSpider extends ItemModTypeFilter { String tooltipName; int max = 4; String guiType; - public ModAntiSpider(String type, int effect, ItemStack[] items, int[] values) - { + public ModAntiSpider(String type, int effect, ItemStack[] items, int[] values) { super(effect, "ModAntiSpider", items, values); tooltipName = "\u00a72Bane of Arthropods"; guiType = type; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; - if (matchingAmount(input) > max) - return false; + if (matchingAmount(input) > max) return false; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= keyPair[1]) - return true; - - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; - - else - return false; + if (keyPair[0] + matchingAmount(input) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; + else return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int increase = matchingAmount(input); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int[] keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -55,29 +42,24 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); String modName = "\u00a72" + guiType + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] { increase, max, tooltipIndex }; + int[] keyPair = new int[] {increase, max, tooltipIndex}; tags.setIntArray(key, keyPair); } } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; String modName = "\u00a72" + guiType + " (" + keys[0] + "/" + keys[1] + ")"; diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java index 8c7309bb07c..42d9e3843b9 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java @@ -1,14 +1,12 @@ package tconstruct.modifiers.tools; +import java.util.Arrays; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; -import java.util.Arrays; - -public class ModAttack extends ItemModTypeFilter -{ +public class ModAttack extends ItemModTypeFilter { String tooltipName; int max; int threshold; @@ -17,8 +15,7 @@ public class ModAttack extends ItemModTypeFilter boolean ammoOnly; // Regular weapons - public ModAttack(String type, int effect, ItemStack[] items, int[] value) - { + public ModAttack(String type, int effect, ItemStack[] items, int[] value) { super(effect, "ModAttack", items, value); tooltipName = "\u00a7fSharpness"; guiType = type; @@ -29,8 +26,7 @@ public ModAttack(String type, int effect, ItemStack[] items, int[] value) } // projectiles - public ModAttack(String type, int effect, ItemStack[] items, int[] value, boolean ammoOnly) - { + public ModAttack(String type, int effect, ItemStack[] items, int[] value, boolean ammoOnly) { super(effect, "ModAttack", items, value); tooltipName = "\u00a7fSharpness"; guiType = type; @@ -41,8 +37,8 @@ public ModAttack(String type, int effect, ItemStack[] items, int[] value, boolea } // gloves - public ModAttack(String type, int effect, ItemStack[] items, int[] value, int max, int threshold, String modifierType) - { + public ModAttack( + String type, int effect, ItemStack[] items, int[] value, int max, int threshold, String modifierType) { super(effect, "ModAttack", items, value); tooltipName = "\u00a7fKnuckles"; guiType = type; @@ -53,64 +49,49 @@ public ModAttack(String type, int effect, ItemStack[] items, int[] value, int ma } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if(tool.getItem() instanceof ToolCore) - { - if(Arrays.asList(((ToolCore) tool.getItem()).getTraits()).contains("ammo") != ammoOnly) - return false; + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { + if (Arrays.asList(((ToolCore) tool.getItem()).getTraits()).contains("ammo") != ammoOnly) return false; } - if (tool.getItem() instanceof IModifyable) - { + if (tool.getItem() instanceof IModifyable) { IModifyable toolItem = (IModifyable) tool.getItem(); - if (!validType(toolItem)) - return false; + if (!validType(toolItem)) return false; - if (matchingAmount(input) > max) - return false; + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag(toolItem.getBaseTagName()); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= keyPair[1]) - return true; - - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; + if (keyPair[0] + matchingAmount(input) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; } return false; } @Override - public boolean validType (IModifyable input) - { + public boolean validType(IModifyable input) { String type = input.getModifyType(); return type.equals(modifierType); } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { IModifyable toolItem = (IModifyable) tool.getItem(); NBTTagCompound tags = tool.getTagCompound().getCompoundTag(toolItem.getBaseTagName()); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int[] keyPair = tags.getIntArray(key); int increase = matchingAmount(input); int leftToBoost = threshold - (keyPair[0] % threshold); - if (increase >= leftToBoost) - { + if (increase >= leftToBoost) { int attack = tags.getInteger("Attack"); attack += 1; tags.setInteger("Attack", attack); } - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -118,24 +99,20 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); int increase = matchingAmount(input); String modName = "\u00a7f" + guiType + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] { increase, max, tooltipIndex }; + int[] keyPair = new int[] {increase, max, tooltipIndex}; tags.setIntArray(key, keyPair); int attack = tags.getInteger("Attack"); @@ -144,8 +121,7 @@ public void modify (ItemStack[] input, ItemStack tool) } } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag(getTagName(tool)); String tip = "ModifierTip" + keys[2]; String modName = "\u00a7f" + guiType + " (" + keys[0] + "/" + keys[1] + ")"; diff --git a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java index c640c7683ed..7f78bdb29ef 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java @@ -3,21 +3,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class ModAutoSmelt extends ModBoolean -{ +public class ModAutoSmelt extends ModBoolean { - public ModAutoSmelt(ItemStack[] items, int effect, String tag, String c, String tip) - { + public ModAutoSmelt(ItemStack[] items, int effect, String tag, String c, String tip) { super(items, effect, tag, c, tip); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Silk Touch")) - return false; - return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); //Will fail if the modifier is false or the tag doesn't exist + if (tags.getBoolean("Silk Touch")) return false; + return tags.getInteger("Modifiers") > 0 + && !tags.getBoolean(key); // Will fail if the modifier is false or the tag doesn't exist } - } diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index 3ccc35c00c3..75c6c68fa88 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -5,55 +5,41 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; -public class ModBlaze extends ItemModTypeFilter -{ +public class ModBlaze extends ItemModTypeFilter { String tooltipName; int max; - public ModBlaze(int effect, ItemStack[] items, int[] values) - { + public ModBlaze(int effect, ItemStack[] items, int[] values) { super(effect, "Blaze", items, values); tooltipName = "\u00a76Fiery"; max = 25; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (tool.getItem() instanceof ToolCore) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { ToolCore toolItem = (ToolCore) tool.getItem(); - if (!validType(toolItem)) - return false; + if (!validType(toolItem)) return false; - if (matchingAmount(input) > max) - return false; + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= keyPair[1]) - return true; - - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; - + if (keyPair[0] + matchingAmount(input) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; } return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int increase = matchingAmount(input); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int[] keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -61,41 +47,34 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); String modName = "\u00a76Blaze (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] { increase, max, tooltipIndex }; + int[] keyPair = new int[] {increase, max, tooltipIndex}; tags.setIntArray(key, keyPair); } int fiery = tags.getInteger("Fiery"); fiery += (increase); tags.setInteger("Fiery", fiery); - } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; String modName = "\u00a76Blaze (" + keys[0] + "/" + keys[1] + ")"; tags.setString(tip, modName); } - public boolean validType (ToolCore tool) - { + public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.getTraits()); return list.contains("melee") || list.contains("ammo"); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java index 58f03082956..5d67d5bbc24 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java @@ -6,28 +6,25 @@ /* Adds a boolean NBTTag */ -public class ModBoolean extends ItemModifier -{ +public class ModBoolean extends ItemModifier { String color; String tooltipName; - public ModBoolean(ItemStack[] items, int effect, String tag, String c, String tip) - { + public ModBoolean(ItemStack[] items, int effect, String tag, String c, String tip) { super(items, effect, tag); color = c; tooltipName = tip; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); //Will fail if the modifier is false or the tag doesn't exist + return tags.getInteger("Modifiers") > 0 + && !tags.getBoolean(key); // Will fail if the modifier is false or the tag doesn't exist } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean(key, true); diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index b2fb3d7c190..5434a2b0c60 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -6,26 +6,20 @@ import net.minecraft.nbt.*; import tconstruct.library.tools.ToolCore; -public class ModButtertouch extends ModBoolean -{ +public class ModButtertouch extends ModBoolean { - public ModButtertouch(ItemStack[] items, int effect) - { + public ModButtertouch(ItemStack[] items, int effect) { super(items, effect, "Silk Touch", "\u00a7e", "Silky"); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (tool.getItem() instanceof ToolCore) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { ToolCore toolItem = (ToolCore) tool.getItem(); - if (!validType(toolItem)) - return false; + if (!validType(toolItem)) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.getBoolean("Lava") && !tags.hasKey("Lapis")) - { + if (!tags.getBoolean("Lava") && !tags.hasKey("Lapis")) { return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); } } @@ -33,8 +27,7 @@ protected boolean canModify (ItemStack tool, ItemStack[] input) } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean(key, true); addEnchantment(tool, Enchantment.silkTouch, 1); @@ -45,57 +38,48 @@ public void modify (ItemStack[] input, ItemStack tool) int attack = tags.getInteger("Attack"); attack -= 3; - if (attack < 0) - attack = 0; + if (attack < 0) attack = 0; tags.setInteger("Attack", attack); int miningSpeed = tags.getInteger("MiningSpeed"); miningSpeed -= 300; - if (miningSpeed < 0) - miningSpeed = 0; + if (miningSpeed < 0) miningSpeed = 0; tags.setInteger("MiningSpeed", miningSpeed); - if (tags.hasKey("MiningSpeed2")) - { + if (tags.hasKey("MiningSpeed2")) { int miningSpeed2 = tags.getInteger("MiningSpeed2"); miningSpeed2 -= 300; - if (miningSpeed2 < 0) - miningSpeed2 = 0; + if (miningSpeed2 < 0) miningSpeed2 = 0; tags.setInteger("MiningSpeed2", miningSpeed2); } addToolTip(tool, color + tooltipName, color + key); } - public void addEnchantment (ItemStack tool, Enchantment enchant, int level) //TODO: Move this to ItemModifier - { + public void addEnchantment(ItemStack tool, Enchantment enchant, int level) // TODO: Move this to ItemModifier + { NBTTagList tags = new NBTTagList(); Map enchantMap = EnchantmentHelper.getEnchantments(tool); Iterator iterator = enchantMap.keySet().iterator(); int index; int lvl; boolean hasEnchant = false; - while (iterator.hasNext()) - { + while (iterator.hasNext()) { NBTTagCompound enchantTag = new NBTTagCompound(); index = ((Integer) iterator.next()).intValue(); lvl = (Integer) enchantMap.get(index); - if (index == enchant.effectId) - { + if (index == enchant.effectId) { hasEnchant = true; enchantTag.setShort("id", (short) index); enchantTag.setShort("lvl", (short) ((byte) level)); tags.appendTag(enchantTag); - } - else - { + } else { enchantTag.setShort("id", (short) index); enchantTag.setShort("lvl", (short) ((byte) lvl)); tags.appendTag(enchantTag); } } - if (!hasEnchant) - { + if (!hasEnchant) { NBTTagCompound enchantTag = new NBTTagCompound(); enchantTag.setShort("id", (short) enchant.effectId); enchantTag.setShort("lvl", (short) ((byte) level)); @@ -104,8 +88,7 @@ public void addEnchantment (ItemStack tool, Enchantment enchant, int level) //TO tool.stackTagCompound.setTag("ench", tags); } - public boolean validType (ToolCore tool) - { + public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.getTraits()); return list.contains("weapon") || list.contains("harvest"); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java b/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java index ea01fd7fd79..2244137c6f0 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModCreativeToolModifier.java @@ -5,26 +5,19 @@ import tconstruct.library.modifier.ItemModifier; import tconstruct.library.tools.ToolCore; -public class ModCreativeToolModifier extends ItemModifier -{ - public ModCreativeToolModifier(ItemStack[] items) - { +public class ModCreativeToolModifier extends ItemModifier { + public ModCreativeToolModifier(ItemStack[] items) { super(items, 0, ""); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (tool.getItem() instanceof ToolCore) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { ToolCore toolItem = (ToolCore) tool.getItem(); - for (ItemStack stack : input) - { - if (stack != null && stack.hasTagCompound()) - { + for (ItemStack stack : input) { + if (stack != null && stack.hasTagCompound()) { String targetLock = stack.getTagCompound().getString("TargetLock"); - if (!targetLock.equals("") && !targetLock.equals(toolItem.getToolName())) - return false; + if (!targetLock.equals("") && !targetLock.equals(toolItem.getToolName())) return false; } } return true; @@ -33,15 +26,12 @@ protected boolean canModify (ItemStack tool, ItemStack[] input) } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int modifiers = tags.getInteger("Modifiers"); modifiers += 1; tags.setInteger("Modifiers", modifiers); } - public void addMatchingEffect (ItemStack tool) - { - } + public void addMatchingEffect(ItemStack tool) {} } diff --git a/src/main/java/tconstruct/modifiers/tools/ModDurability.java b/src/main/java/tconstruct/modifiers/tools/ModDurability.java index bac86c33f75..6941e3f6797 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModDurability.java +++ b/src/main/java/tconstruct/modifiers/tools/ModDurability.java @@ -7,16 +7,14 @@ /* Adds an integer NBTTag */ -public class ModDurability extends ItemModifier -{ +public class ModDurability extends ItemModifier { String tooltipName; String color; int durability; float modifier; int miningLevel; - public ModDurability(ItemStack[] items, int effect, int dur, float mod, int level, String k, String tip, String c) - { + public ModDurability(ItemStack[] items, int effect, int dur, float mod, int level, String k, String tip, String c) { super(items, effect, k); durability = dur; modifier = mod; @@ -26,17 +24,14 @@ public ModDurability(ItemStack[] items, int effect, int dur, float mod, int leve } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.hasKey(key)) - return false; + if (tags.hasKey(key)) return false; return super.canModify(tool, input); } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int base = tags.getInteger("BaseDurability"); @@ -47,18 +42,15 @@ public void modify (ItemStack[] input, ItemStack tool) modDur += modifier; int total = (int) ((base + bonus) * (modDur + 1f)); - if (total <= 0) - total = 1; + if (total <= 0) total = 1; tags.setInteger("TotalDurability", total); tags.setInteger("BonusDurability", bonus); tags.setFloat("ModDurability", modDur); - if (PHConstruct.miningLevelIncrease) - { + if (PHConstruct.miningLevelIncrease) { int mLevel = tags.getInteger("HarvestLevel"); - if (mLevel < miningLevel) - tags.setInteger("HarvestLevel", miningLevel); + if (mLevel < miningLevel) tags.setInteger("HarvestLevel", miningLevel); } int modifiers = tags.getInteger("Modifiers"); @@ -69,5 +61,4 @@ public void modify (ItemStack[] input, ItemStack tool) String modTip = color + key; addToolTip(tool, tooltipName, modTip); } - } diff --git a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java index 4a0f367a947..ba3abae0dbf 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java @@ -4,21 +4,16 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.*; -public class ModExtraModifier extends ItemModifier -{ - public ModExtraModifier(ItemStack[] items, String dataKey) - { +public class ModExtraModifier extends ItemModifier { + public ModExtraModifier(ItemStack[] items, String dataKey) { super(items, 0, dataKey); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] recipe) - { - if (tool != null && tool.getItem() instanceof IModifyable) - { + protected boolean canModify(ItemStack tool, ItemStack[] recipe) { + if (tool != null && tool.getItem() instanceof IModifyable) { NBTTagCompound tags = this.getModifierTag(tool); - if (tags.getBoolean(key)) - { + if (tags.getBoolean(key)) { return false; } return true; @@ -27,8 +22,7 @@ protected boolean canModify (ItemStack tool, ItemStack[] recipe) } @Override - public void modify (ItemStack[] recipe, ItemStack input) - { + public void modify(ItemStack[] recipe, ItemStack input) { NBTTagCompound tags = this.getModifierTag(input); tags.setBoolean(key, true); int modifiers = tags.getInteger("Modifiers"); @@ -36,7 +30,5 @@ public void modify (ItemStack[] recipe, ItemStack input) tags.setInteger("Modifiers", modifiers); } - public void addMatchingEffect (ItemStack tool) - { - } + public void addMatchingEffect(ItemStack tool) {} } diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 47a6713f73e..02b5f5bd8eb 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -2,9 +2,6 @@ import cofh.api.energy.IEnergyContainerItem; import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.IModifyable; @@ -13,81 +10,70 @@ /* TE3 support */ -public class ModFlux extends ModBoolean -{ +public class ModFlux extends ModBoolean { public ArrayList batteries = new ArrayList(); public int modifiersRequired = 1; // LALALALA totally not hidden IguanaTweaks Support LALALALA - public ModFlux() - { + public ModFlux() { super(new ItemStack[0], 9, "Flux", "\u00a7e", ""); } @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { + public boolean matches(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); // not on ammo weapons, since they don't have durability technically - String[] traits = ((IModifyable)tool.getItem()).getTraits(); - for(String trait : traits) - if("ammo".equals(trait)) - return false; + String[] traits = ((IModifyable) tool.getItem()).getTraits(); + for (String trait : traits) if ("ammo".equals(trait)) return false; ItemStack foundBattery = null; // try to find the battery in the input for (ItemStack stack : input) - for (ItemStack battery : batteries) - { - if (stack == null) - continue; - if (stack.getItem() != battery.getItem()) - continue; - if (!(stack.getItem() instanceof IEnergyContainerItem)) - continue; + for (ItemStack battery : batteries) { + if (stack == null) continue; + if (stack.getItem() != battery.getItem()) continue; + if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; // we don't allow multiple batteries to be added - if (foundBattery != null) - return false; + if (foundBattery != null) return false; // battery found, gogogo foundBattery = stack; } // no battery present - if (foundBattery == null) - return false; + if (foundBattery == null) return false; int maxEnergy = ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery); // battery too big for our tool? - if(PHConstruct.balancedFluxModifier && tags.getInteger("TotalDurability") < maxEnergy/1000) // durability needs to be at least 1/1000th of the charge - return false; + if (PHConstruct.balancedFluxModifier + && tags.getInteger("TotalDurability") + < maxEnergy / 1000) // durability needs to be at least 1/1000th of the charge + return false; // check if we already have a flux modifier - if (tags.getBoolean(key)) - { + if (tags.getBoolean(key)) { // only allow if it's an upgrade - // remark: we use the ToolCores function here instead of accessing the tag directly, to achieve backwards compatibility with tools without tags. + // remark: we use the ToolCores function here instead of accessing the tag directly, to achieve backwards + // compatibility with tools without tags. int a = ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery); int b = ((ToolCore) tool.getItem()).getMaxEnergyStored(tool); - return ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery) > ((ToolCore) tool.getItem()).getMaxEnergyStored(tool); + return ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery) + > ((ToolCore) tool.getItem()).getMaxEnergyStored(tool); } // otherwise check if we have enough modfiers - else if (tags.getInteger("Modifiers") < modifiersRequired) - return false; + else if (tags.getInteger("Modifiers") < modifiersRequired) return false; // all requirements satisfied! return true; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound(); // update modifiers (only applies if it's not an upgrade) - if (!tags.hasKey(key)) - { + if (!tags.hasKey(key)) { int modifiers = tags.getCompoundTag("InfiTool").getInteger("Modifiers"); modifiers -= modifiersRequired; tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); @@ -99,14 +85,10 @@ public void modify (ItemStack[] input, ItemStack tool) // find the battery in the input ItemStack inputBattery = null; for (ItemStack stack : input) - for (ItemStack battery : batteries) - { - if (stack == null) - continue; - if (stack.getItem() != battery.getItem()) - continue; - if (!(stack.getItem() instanceof IEnergyContainerItem)) - continue; + for (ItemStack battery : batteries) { + if (stack == null) continue; + if (stack.getItem() != battery.getItem()) continue; + if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; // we're guaranteed to only find one battery because more are prevented above inputBattery = stack; @@ -119,16 +101,14 @@ public void modify (ItemStack[] input, ItemStack tool) int charge = energyContainer.getEnergyStored(inputBattery); // add already present charge in the tool - if (tags.hasKey("Energy")) - charge += tags.getInteger("Energy"); + if (tags.hasKey("Energy")) charge += tags.getInteger("Energy"); int maxCharge = energyContainer.getMaxEnergyStored(inputBattery); ItemStack subject42 = inputBattery.copy(); int progress = 0, change = 1; // prevent endless loops with creative battery, blah // fill the battery full - while (progress < maxCharge && change > 0) - { + while (progress < maxCharge && change > 0) { change = energyContainer.receiveEnergy(subject42, 100000, false); progress += change; } @@ -140,8 +120,7 @@ public void modify (ItemStack[] input, ItemStack tool) // completely empty the battery progress = 0; change = 1; - while (progress < maxCharge && change > 0) - { + while (progress < maxCharge && change > 0) { change = energyContainer.extractEnergy(subject42, 100000, false); progress += change; } @@ -157,6 +136,7 @@ public void modify (ItemStack[] input, ItemStack tool) tags.setInteger(key, 1); ToolCore toolcore = (ToolCore) tool.getItem(); - //tool.setItemDamage(1 + (toolcore.getMaxEnergyStored(tool) - charge) * (tool.getMaxDamage() - 1) / toolcore.getMaxEnergyStored(tool)); + // tool.setItemDamage(1 + (toolcore.getMaxEnergyStored(tool) - charge) * (tool.getMaxDamage() - 1) / + // toolcore.getMaxEnergyStored(tool)); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModInteger.java b/src/main/java/tconstruct/modifiers/tools/ModInteger.java index 40ba1f98257..ea2ff1aea91 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModInteger.java +++ b/src/main/java/tconstruct/modifiers/tools/ModInteger.java @@ -6,23 +6,21 @@ /* Adds an integer NBTTag */ -public class ModInteger extends ItemModifier -{ +public class ModInteger extends ItemModifier { String color; String tooltipName; int initialIncrease; int secondaryIncrease; - public ModInteger(ItemStack[] items, int effect, String dataKey, int increase, String c, String tip) - { + public ModInteger(ItemStack[] items, int effect, String dataKey, int increase, String c, String tip) { super(items, effect, dataKey); initialIncrease = secondaryIncrease = increase; color = c; tooltipName = tip; } - public ModInteger(ItemStack[] items, int effect, String dataKey, int increase1, int increase2, String c, String tip) - { + public ModInteger( + ItemStack[] items, int effect, String dataKey, int increase1, int increase2, String c, String tip) { super(items, effect, dataKey); initialIncrease = increase1; secondaryIncrease = increase2; @@ -31,17 +29,13 @@ public ModInteger(ItemStack[] items, int effect, String dataKey, int increase1, } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int increase = tags.getInteger(key); increase += secondaryIncrease; tags.setInteger(key, increase); - } - else - { + } else { tags.setInteger(key, initialIncrease); } @@ -51,5 +45,4 @@ public void modify (ItemStack[] input, ItemStack tool) addToolTip(tool, color + tooltipName, color + key); } - } diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index 8758769c0b7..4e2b3fc740f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -6,55 +6,44 @@ import net.minecraft.nbt.*; import tconstruct.library.tools.ToolCore; -public class ModLapis extends ItemModTypeFilter -{ +public class ModLapis extends ItemModTypeFilter { String tooltipName; int max = 450; - public ModLapis(int effect, ItemStack[] items, int[] values) - { + public ModLapis(int effect, ItemStack[] items, int[] values) { super(effect, "Lapis", items, values); tooltipName = "\u00a79Luck"; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (tool.getItem() instanceof ToolCore) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { ToolCore toolItem = (ToolCore) tool.getItem(); - if (!validType(toolItem)) - return false; + if (!validType(toolItem)) return false; - if (matchingAmount(input) > max) - return false; + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getBoolean("Silk Touch")) - return false; + if (tags.getBoolean("Silk Touch")) return false; - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= max) - return true; + if (keyPair[0] + matchingAmount(input) <= max) return true; } return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - { + if (!tags.hasKey(key)) { tags.setBoolean(key, true); String modName = "\u00a79Lapis (0/450)"; int tooltipIndex = addToolTip(tool, "\u00a79Luck", modName); - int[] keyPair = new int[] { 0, tooltipIndex }; + int[] keyPair = new int[] {0, tooltipIndex}; tags.setIntArray(key, keyPair); int modifiers = tags.getInteger("Modifiers"); @@ -70,135 +59,92 @@ public void modify (ItemStack[] input, ItemStack tool) String[] types = toolcore.getTraits(); boolean weapon = false; boolean harvest = false; - for (String s : types) - { - if (s.equals("harvest")) - harvest = true; - else if (s.equals("weapon")) - weapon = true; + for (String s : types) { + if (s.equals("harvest")) harvest = true; + else if (s.equals("weapon")) weapon = true; } - if (weapon) - { - if (keyPair[0] >= 450) - addEnchantment(tool, Enchantment.looting, 3); - else if (keyPair[0] >= 300) - addEnchantment(tool, Enchantment.looting, 2); - else if (keyPair[0] >= 100) - addEnchantment(tool, Enchantment.looting, 1); + if (weapon) { + if (keyPair[0] >= 450) addEnchantment(tool, Enchantment.looting, 3); + else if (keyPair[0] >= 300) addEnchantment(tool, Enchantment.looting, 2); + else if (keyPair[0] >= 100) addEnchantment(tool, Enchantment.looting, 1); } - if (harvest) - { - if (keyPair[0] >= 450) - addEnchantment(tool, Enchantment.fortune, 3); - else if (keyPair[0] >= 300) - addEnchantment(tool, Enchantment.fortune, 2); - else if (keyPair[0] >= 100) - addEnchantment(tool, Enchantment.fortune, 1); + if (harvest) { + if (keyPair[0] >= 450) addEnchantment(tool, Enchantment.fortune, 3); + else if (keyPair[0] >= 300) addEnchantment(tool, Enchantment.fortune, 2); + else if (keyPair[0] >= 100) addEnchantment(tool, Enchantment.fortune, 1); } updateModTag(tool, keyPair); } - public void midStreamModify (ItemStack tool, ToolCore toolItem) - { + public void midStreamModify(ItemStack tool, ToolCore toolItem) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return; + if (!tags.hasKey(key)) return; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] == max) - return; + if (keyPair[0] == max) return; - if (random.nextInt(50) == 0) - { + if (random.nextInt(50) == 0) { keyPair[0] += 1; tags.setIntArray(key, keyPair); updateModTag(tool, keyPair); } List list = Arrays.asList(toolItem.getTraits()); - if (list.contains("weapon")) - { - if (keyPair[0] >= 450) - { + if (list.contains("weapon")) { + if (keyPair[0] >= 450) { addEnchantment(tool, Enchantment.looting, 3); - } - else if (keyPair[0] >= 350) - { + } else if (keyPair[0] >= 350) { int chance = keyPair[0] - 300; - if (random.nextInt(1000 - chance) == 0) - addEnchantment(tool, Enchantment.looting, 3); - } - else if (keyPair[0] >= 125) - { + if (random.nextInt(1000 - chance) == 0) addEnchantment(tool, Enchantment.looting, 3); + } else if (keyPair[0] >= 125) { int chance = keyPair[0] - 175; - if (random.nextInt(600 - chance) == 0) - addEnchantment(tool, Enchantment.looting, 2); - } - else if (keyPair[0] >= 10) - { + if (random.nextInt(600 - chance) == 0) addEnchantment(tool, Enchantment.looting, 2); + } else if (keyPair[0] >= 10) { int chance = keyPair[0] - 25; - if (random.nextInt(250 - chance) == 0) - addEnchantment(tool, Enchantment.looting, 1); + if (random.nextInt(250 - chance) == 0) addEnchantment(tool, Enchantment.looting, 1); } } - if (list.contains("harvest")) - { - if (keyPair[0] >= 450) - { + if (list.contains("harvest")) { + if (keyPair[0] >= 450) { addEnchantment(tool, Enchantment.fortune, 3); - } - else if (keyPair[0] >= 350) - { + } else if (keyPair[0] >= 350) { int chance = keyPair[0] - 300; - if (random.nextInt(1000 - chance) == 0) - addEnchantment(tool, Enchantment.fortune, 3); - } - else if (keyPair[0] >= 125) - { + if (random.nextInt(1000 - chance) == 0) addEnchantment(tool, Enchantment.fortune, 3); + } else if (keyPair[0] >= 125) { int chance = keyPair[0] - 175; - if (random.nextInt(600 - chance) == 0) - addEnchantment(tool, Enchantment.fortune, 2); - } - else if (keyPair[0] >= 10) - { + if (random.nextInt(600 - chance) == 0) addEnchantment(tool, Enchantment.fortune, 2); + } else if (keyPair[0] >= 10) { int chance = keyPair[0] - 25; - if (random.nextInt(250 - chance) == 0) - addEnchantment(tool, Enchantment.fortune, 1); + if (random.nextInt(250 - chance) == 0) addEnchantment(tool, Enchantment.fortune, 1); } } } - public void addEnchantment (ItemStack tool, Enchantment enchant, int level) - { + public void addEnchantment(ItemStack tool, Enchantment enchant, int level) { NBTTagList tags = new NBTTagList(); Map enchantMap = EnchantmentHelper.getEnchantments(tool); Iterator iterator = enchantMap.keySet().iterator(); int index; int lvl; boolean hasEnchant = false; - while (iterator.hasNext()) - { + while (iterator.hasNext()) { NBTTagCompound enchantTag = new NBTTagCompound(); index = ((Integer) iterator.next()).intValue(); lvl = (Integer) enchantMap.get(index); - if (index == enchant.effectId) - { + if (index == enchant.effectId) { hasEnchant = true; enchantTag.setShort("id", (short) index); enchantTag.setShort("lvl", (short) ((byte) level)); tags.appendTag(enchantTag); - } - else - { + } else { enchantTag.setShort("id", (short) index); enchantTag.setShort("lvl", (short) ((byte) lvl)); tags.appendTag(enchantTag); } } - if (!hasEnchant) - { + if (!hasEnchant) { NBTTagCompound enchantTag = new NBTTagCompound(); enchantTag.setShort("id", (short) enchant.effectId); enchantTag.setShort("lvl", (short) ((byte) level)); @@ -207,16 +153,14 @@ public void addEnchantment (ItemStack tool, Enchantment enchant, int level) tool.stackTagCompound.setTag("ench", tags); } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[1]; String modName = "\u00a79Lapis (" + keys[0] + "/" + max + ")"; tags.setString(tip, modName); } - public boolean validType (ToolCore tool) - { + public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.getTraits()); return !list.contains("ammo") && (list.contains("weapon") || list.contains("harvest")); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index d850c48fd29..7356b077e25 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -5,54 +5,40 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; -public class ModPiston extends ItemModTypeFilter -{ +public class ModPiston extends ItemModTypeFilter { String tooltipName; int max = 10; - public ModPiston(int effect, ItemStack[] items, int[] values) - { + public ModPiston(int effect, ItemStack[] items, int[] values) { super(effect, "Piston", items, values); tooltipName = "\u00a77Knockback"; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (tool.getItem() instanceof ToolCore) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { ToolCore toolItem = (ToolCore) tool.getItem(); - if (!validType(toolItem)) - return false; + if (!validType(toolItem)) return false; - if (matchingAmount(input) > max) - return false; + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= keyPair[1]) - return true; - - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; - + if (keyPair[0] + matchingAmount(input) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; } return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int increase = matchingAmount(input); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int[] keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -60,22 +46,18 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Knockback (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] { increase, max, tooltipIndex }; + int[] keyPair = new int[] {increase, max, tooltipIndex}; tags.setIntArray(key, keyPair); } @@ -85,16 +67,14 @@ public void modify (ItemStack[] input, ItemStack tool) tags.setFloat("Knockback", knockback); } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; String modName = "\u00a77Knockback (" + keys[0] + "/" + keys[1] + ")"; tags.setString(tip, modName); } - public boolean validType (ToolCore tool) - { + public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.getTraits()); return list.contains("weapon") || list.contains("ammo"); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModPotion.java b/src/main/java/tconstruct/modifiers/tools/ModPotion.java index f535940af25..87f20e72ef6 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPotion.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPotion.java @@ -5,28 +5,20 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.ItemModifier; -public class ModPotion extends ItemModifier -{ +public class ModPotion extends ItemModifier { - public ModPotion(ItemStack[] items, int effect, String dataKey) - { - super(new ItemStack[] { new ItemStack(Items.potionitem, 1, Short.MAX_VALUE) }, 0, ""); + public ModPotion(ItemStack[] items, int effect, String dataKey) { + super(new ItemStack[] {new ItemStack(Items.potionitem, 1, Short.MAX_VALUE)}, 0, ""); } - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); NBTTagCompound potion = tool.getTagCompound().getCompoundTag("Potion"); - if (potion == null) - return true; + if (potion == null) return true; return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { - - } - + public void modify(ItemStack[] input, ItemStack tool) {} } diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index b40861f9b28..d74f3a63205 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -6,56 +6,44 @@ import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; -public class ModRedstone extends ItemModTypeFilter -{ +public class ModRedstone extends ItemModTypeFilter { public String tooltipName; public int max = 50; - public ModRedstone(int effect, ItemStack[] items, int[] values) - { + public ModRedstone(int effect, ItemStack[] items, int[] values) { super(effect, "Redstone", items, values); tooltipName = "\u00a74Haste"; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (tool.getItem() instanceof ToolCore) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (tool.getItem() instanceof ToolCore) { ToolCore toolItem = (ToolCore) tool.getItem(); - if (!validType(toolItem)) - return false; + if (!validType(toolItem)) return false; - if (matchingAmount(input) > max) - return false; + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= keyPair[1]) - return true; - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; + if (keyPair[0] + matchingAmount(input) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; } return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int[] keyPair; int increase = matchingAmount(input); int current = 0; - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -63,23 +51,19 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } current = keyPair[0]; updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - keyPair = new int[] { increase, max, tooltipIndex }; + keyPair = new int[] {increase, max, tooltipIndex}; current = keyPair[0]; tags.setIntArray(key, keyPair); } @@ -87,25 +71,19 @@ public void modify (ItemStack[] input, ItemStack tool) int miningSpeed = tags.getInteger("MiningSpeed"); int boost = 8 + ((current - 1) / 50 * 2); Item temp = tool.getItem(); - if (temp instanceof ToolCore) - { + if (temp instanceof ToolCore) { ToolCore toolcore = (ToolCore) temp; - if (toolcore.durabilityTypeHandle() == 2) - boost += 2; - if (toolcore.durabilityTypeAccessory() == 2) - boost += 2; - if (toolcore.durabilityTypeExtra() == 2) - boost += 2; + if (toolcore.durabilityTypeHandle() == 2) boost += 2; + if (toolcore.durabilityTypeAccessory() == 2) boost += 2; + if (toolcore.durabilityTypeExtra() == 2) boost += 2; } miningSpeed += (increase * boost); tags.setInteger("MiningSpeed", miningSpeed); - String[] type = { "MiningSpeed2", "MiningSpeedHandle", "MiningSpeedExtra" }; + String[] type = {"MiningSpeed2", "MiningSpeedHandle", "MiningSpeedExtra"}; - for (int i = 0; i < 3; i++) - { - if (tags.hasKey(type[i])) - { + for (int i = 0; i < 3; i++) { + if (tags.hasKey(type[i])) { int speed = tags.getInteger(type[i]); speed += (increase * boost); tags.setInteger(type[i], speed); @@ -113,26 +91,22 @@ public void modify (ItemStack[] input, ItemStack tool) } } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; String modName = "\u00a74Redstone (" + keys[0] + "/" + keys[1] + ")"; tags.setString(tip, modName); } - public boolean validType (IModifyable input) - { + public boolean validType(IModifyable input) { return input.getModifyType().equals("Tool"); } - public boolean validType (ToolCore tool) - { + public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.getTraits()); // handled by the windup modifier - if(list.contains("windup")) - return false; + if (list.contains("windup")) return false; return list.contains("harvest") || list.contains("utility"); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModReinforced.java b/src/main/java/tconstruct/modifiers/tools/ModReinforced.java index d1713bfb65c..dc975691464 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModReinforced.java +++ b/src/main/java/tconstruct/modifiers/tools/ModReinforced.java @@ -3,26 +3,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class ModReinforced extends ModInteger -{ +public class ModReinforced extends ModInteger { - public ModReinforced(ItemStack[] items, int effect, int increase) - { + public ModReinforced(ItemStack[] items, int effect, int increase) { super(items, effect, "Reinforced", 1, "\u00a75", "Reinforced"); } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int increase = tags.getInteger(key); increase += secondaryIncrease; tags.setInteger(key, increase); - } - else - { + } else { tags.setInteger(key, initialIncrease); } @@ -37,28 +31,22 @@ public void modify (ItemStack[] input, ItemStack tool) addToolTip(tool, color + tooltipName, color + key); } - protected int addToolTip (ItemStack tool, String tooltip, String modifierTip) - { + protected int addToolTip(ItemStack tool, String tooltip, String modifierTip) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int tipNum = 0; - while (true) - { + while (true) { tipNum++; String tip = "Tooltip" + tipNum; - if (!tags.hasKey(tip)) - { + if (!tags.hasKey(tip)) { tags.setString(tip, ""); String modTip = "ModifierTip" + tipNum; String tag = tags.getString(modTip); tags.setString(modTip, getProperName(modifierTip, tag)); return tipNum; - } - else - { + } else { String modTip = "ModifierTip" + tipNum; String tag = tags.getString(modTip); - if (tag.contains(modifierTip)) - { + if (tag.contains(modifierTip)) { tags.setString(tip, ""); tag = tags.getString(modTip); tags.setString(modTip, getProperName(modifierTip, tag)); diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java index c6c17e504b8..cd88deb32a1 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -8,60 +8,48 @@ /* Little mod for actually adding the lapis modifier */ -public class ModRepair extends ItemModifier -{ +public class ModRepair extends ItemModifier { - public ModRepair() - { + public ModRepair() { super(new ItemStack[0], 0, ""); } @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { + public boolean matches(ItemStack[] input, ItemStack tool) { return canModify(tool, input); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getInteger("Damage") > 0) - { + if (tags.getInteger("Damage") > 0) { int headID = tags.getInteger("Head"); boolean areInputsValid = true; - for (ItemStack curInput : input) - { - if (curInput != null && headID != PatternBuilder.instance.getPartID(curInput)) - { + for (ItemStack curInput : input) { + if (curInput != null && headID != PatternBuilder.instance.getPartID(curInput)) { areInputsValid = false; break; } } - if (areInputsValid) - { + if (areInputsValid) { return calculateIfNecessary(tool, input); } } return false; } - private boolean calculateIfNecessary (ItemStack tool, ItemStack[] input) - { + private boolean calculateIfNecessary(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int damage = tags.getInteger("Damage"); int numInputs = 0; int materialValue = 0; - for (ItemStack curInput : input) - { - if (curInput != null) - { + for (ItemStack curInput : input) { + if (curInput != null) { materialValue += PatternBuilder.instance.getPartValue(curInput); numInputs++; } } - if (numInputs == 0) - return false; + if (numInputs == 0) return false; int totalRepairValue = calculateIncrease(tool, materialValue, numInputs); float averageRepairValue = totalRepairValue / numInputs; @@ -69,8 +57,7 @@ private boolean calculateIfNecessary (ItemStack tool, ItemStack[] input) return numInputs == 1 || (damage - totalRepairValue >= -averageRepairValue); } - private int calculateIncrease (ItemStack tool, int materialValue, int itemsUsed) - { + private int calculateIncrease(ItemStack tool, int materialValue, int itemsUsed) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int damage = tags.getInteger("Damage"); int dur = tags.getInteger("BaseDurability"); @@ -78,27 +65,22 @@ private int calculateIncrease (ItemStack tool, int materialValue, int itemsUsed) int modifiers = tags.getInteger("Modifiers"); float mods = 1.0f; - if (modifiers == 2) - mods = 0.9f; - else if (modifiers == 1) - mods = 0.8f; - else if (modifiers == 0) - mods = 0.7f; + if (modifiers == 2) mods = 0.9f; + else if (modifiers == 1) mods = 0.8f; + else if (modifiers == 0) mods = 0.7f; increase *= mods; int repair = tags.getInteger("RepairCount"); float repairCount = (100 - repair) / 100f; - if (repairCount < 0.5f) - repairCount = 0.5f; + if (repairCount < 0.5f) repairCount = 0.5f; increase *= repairCount; increase /= ((ToolCore) tool.getItem()).getRepairCost(); return increase; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean("Broken", false); int damage = tags.getInteger("Damage"); @@ -106,10 +88,8 @@ public void modify (ItemStack[] input, ItemStack tool) int itemsUsed = 0; int materialValue = 0; - for (ItemStack curInput : input) - { - if (curInput != null) - { + for (ItemStack curInput : input) { + if (curInput != null) { materialValue += PatternBuilder.instance.getPartValue(curInput); itemsUsed++; } @@ -121,15 +101,12 @@ public void modify (ItemStack[] input, ItemStack tool) tags.setInteger("RepairCount", repair); damage -= increase; - if (damage < 0) - damage = 0; + if (damage < 0) damage = 0; tags.setInteger("Damage", damage); AbilityHelper.damageTool(tool, 0, null, true); } @Override - public void addMatchingEffect (ItemStack tool) - { - } + public void addMatchingEffect(ItemStack tool) {} } diff --git a/src/main/java/tconstruct/modifiers/tools/ModSmite.java b/src/main/java/tconstruct/modifiers/tools/ModSmite.java index ee2b639f3c1..2413437d376 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModSmite.java +++ b/src/main/java/tconstruct/modifiers/tools/ModSmite.java @@ -3,51 +3,38 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class ModSmite extends ItemModTypeFilter -{ +public class ModSmite extends ItemModTypeFilter { String tooltipName; int max = 36; String tagName; - public ModSmite(String type, int effect, ItemStack[] items, int[] values) - { + public ModSmite(String type, int effect, ItemStack[] items, int[] values) { super(effect, "ModSmite", items, values); tooltipName = "\u00a7eSmite"; tagName = type; } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - if (matchingAmount(input) > max) - return false; + protected boolean canModify(ItemStack tool, ItemStack[] input) { + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; + if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; int keyPair[] = tags.getIntArray(key); - if (keyPair[0] + matchingAmount(input) <= keyPair[1]) - return true; - - else if (keyPair[0] == keyPair[1]) - return tags.getInteger("Modifiers") > 0; - - else - return false; + if (keyPair[0] + matchingAmount(input) <= keyPair[1]) return true; + else if (keyPair[0] == keyPair[1]) return tags.getInteger("Modifiers") > 0; + else return false; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int increase = matchingAmount(input); - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { int[] keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -55,29 +42,24 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); String modName = "\u00a7e" + tagName + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] { increase, max, tooltipIndex }; + int[] keyPair = new int[] {increase, max, tooltipIndex}; tags.setIntArray(key, keyPair); } } - void updateModTag (ItemStack tool, int[] keys) - { + void updateModTag(ItemStack tool, int[] keys) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); String tip = "ModifierTip" + keys[2]; String modName = "\u00a7e" + tagName + " (" + keys[0] + "/" + keys[1] + ")"; diff --git a/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java b/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java index 8e05460d538..288ee88b904 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java @@ -7,60 +7,48 @@ import tconstruct.library.modifier.ItemModifier; import tconstruct.library.tools.*; -public class ModToolRepair extends ItemModifier -{ +public class ModToolRepair extends ItemModifier { - public ModToolRepair() - { + public ModToolRepair() { super(new ItemStack[0], 0, ""); } @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { + public boolean matches(ItemStack[] input, ItemStack tool) { return canModify(tool, input); } @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { + protected boolean canModify(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (tags.getInteger("Damage") > 0) - { + if (tags.getInteger("Damage") > 0) { int headID = tags.getInteger("Head"); boolean areInputsValid = true; - for (ItemStack curInput : input) - { - if (curInput != null && headID != PatternBuilder.instance.getPartID(curInput)) - { + for (ItemStack curInput : input) { + if (curInput != null && headID != PatternBuilder.instance.getPartID(curInput)) { areInputsValid = false; break; } } - if (areInputsValid) - { + if (areInputsValid) { return calculateIfNecessary(tool, input); } } return false; } - private boolean calculateIfNecessary (ItemStack tool, ItemStack[] input) - { + private boolean calculateIfNecessary(ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int damage = tags.getInteger("Damage"); int numInputs = 0; int materialValue = 0; - for (ItemStack curInput : input) - { - if (curInput != null) - { + for (ItemStack curInput : input) { + if (curInput != null) { materialValue += PatternBuilder.instance.getPartValue(curInput); numInputs++; } } - if (numInputs == 0) - return false; + if (numInputs == 0) return false; int totalRepairValue = calculateIncrease(tool, materialValue, numInputs); float averageRepairValue = totalRepairValue / numInputs; @@ -68,8 +56,7 @@ private boolean calculateIfNecessary (ItemStack tool, ItemStack[] input) return numInputs == 1 || (damage - totalRepairValue >= -averageRepairValue); } - private int calculateIncrease (ItemStack tool, int materialValue, int itemsUsed) - { + private int calculateIncrease(ItemStack tool, int materialValue, int itemsUsed) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int damage = tags.getInteger("Damage"); int dur = tags.getInteger("BaseDurability"); @@ -77,27 +64,22 @@ private int calculateIncrease (ItemStack tool, int materialValue, int itemsUsed) int modifiers = tags.getInteger("Modifiers"); float mods = 1.0f; - if (modifiers == 2) - mods = 0.9f; - else if (modifiers == 1) - mods = 0.8f; - else if (modifiers == 0) - mods = 0.7f; + if (modifiers == 2) mods = 0.9f; + else if (modifiers == 1) mods = 0.8f; + else if (modifiers == 0) mods = 0.7f; increase *= mods; int repair = tags.getInteger("RepairCount"); float repairCount = (100 - repair) / 100f; - if (repairCount < 0.5f) - repairCount = 0.5f; + if (repairCount < 0.5f) repairCount = 0.5f; increase *= repairCount; increase /= ((ToolCore) tool.getItem()).getRepairCost(); return increase; } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setBoolean("Broken", false); int damage = tags.getInteger("Damage"); @@ -105,10 +87,8 @@ public void modify (ItemStack[] input, ItemStack tool) int itemsUsed = 0; int materialValue = 0; - for (ItemStack curInput : input) - { - if (curInput != null) - { + for (ItemStack curInput : input) { + if (curInput != null) { materialValue += PatternBuilder.instance.getPartValue(curInput); itemsUsed++; } @@ -120,20 +100,16 @@ public void modify (ItemStack[] input, ItemStack tool) tags.setInteger("RepairCount", repair); damage -= increase; - if (damage < 0) - damage = 0; + if (damage < 0) damage = 0; tags.setInteger("Damage", damage); AbilityHelper.damageTool(tool, 0, null, true); } @Override - public void addMatchingEffect (ItemStack tool) - { - } + public void addMatchingEffect(ItemStack tool) {} - public boolean validType (IModifyable input) - { + public boolean validType(IModifyable input) { return input.getModifyType().equals("Tool") || input.getModifyType().equals("Armor"); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModWindup.java b/src/main/java/tconstruct/modifiers/tools/ModWindup.java index a654b3d4b93..ff3da870125 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModWindup.java +++ b/src/main/java/tconstruct/modifiers/tools/ModWindup.java @@ -1,45 +1,38 @@ package tconstruct.modifiers.tools; -import net.minecraft.item.Item; +import java.util.Arrays; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; -import java.util.Arrays; -import java.util.List; - public class ModWindup extends ModRedstone { public ModWindup(int effect, ItemStack[] items, int[] values) { super(effect, items, values); } - public boolean validType (ToolCore tool) - { + public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.getTraits()); return list.contains("windup"); } @Override protected boolean canModify(ItemStack tool, ItemStack[] input) { - if(!super.canModify(tool, input)) - return false; + if (!super.canModify(tool, input)) return false; float drawSSpeed = tool.getTagCompound().getCompoundTag("InfiTool").getFloat("DrawSpeed"); return drawSSpeed > 0.25f * 20f; // can't get below 1/4s } @Override - public void modify (ItemStack[] input, ItemStack tool) - { + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); int[] keyPair; int increase = matchingAmount(input); int current = 0; - if (tags.hasKey(key)) - { + if (tags.hasKey(key)) { keyPair = tags.getIntArray(key); - if (keyPair[0] % max == 0) - { + if (keyPair[0] % max == 0) { keyPair[0] += increase; keyPair[1] += max; tags.setIntArray(key, keyPair); @@ -47,23 +40,19 @@ public void modify (ItemStack[] input, ItemStack tool) int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); - } - else - { + } else { keyPair[0] += increase; tags.setIntArray(key, keyPair); } current = keyPair[0]; updateModTag(tool, keyPair); - } - else - { + } else { int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Redstone (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - keyPair = new int[] { increase, max, tooltipIndex }; + keyPair = new int[] {increase, max, tooltipIndex}; current = keyPair[0]; tags.setIntArray(key, keyPair); } @@ -72,11 +61,10 @@ public void modify (ItemStack[] input, ItemStack tool) float boost = 0.10f * current; // with added bonus for multiple modifiers of redstone // so every 50 redstone you get a bonus speed - for(int i = 0; i < current/50; i++) - boost += 2.0f; + for (int i = 0; i < current / 50; i++) boost += 2.0f; int baseDrawSpeed = tags.getInteger("BaseDrawSpeed"); - int drawSpeed = baseDrawSpeed - (int)boost; + int drawSpeed = baseDrawSpeed - (int) boost; drawSpeed = Math.max(5, drawSpeed); // 0.25f is the minimum tags.setInteger("DrawSpeed", drawSpeed); } diff --git a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java index 049ef76ace6..b2e14eb2195 100644 --- a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java +++ b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java @@ -3,46 +3,43 @@ import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import tconstruct.TConstruct; -import tconstruct.library.armor.ArmorPart; import tconstruct.library.crafting.ModifyBuilder; -import tconstruct.modifiers.armor.AModBoolean; import tconstruct.modifiers.armor.AModThaumicVision; import tconstruct.world.TinkerWorld; import thaumcraft.api.ItemApi; -import java.util.EnumSet; - @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft", pulsesRequired = "Tinkers' World", forced = true) -public class TinkerThaumcraft -{ +@Pulse( + id = "Tinkers Thaumcraft Compatibility", + description = "Tinkers Construct compatibility for Thaumcraft", + modsRequired = "Thaumcraft", + pulsesRequired = "Tinkers' World", + forced = true) +public class TinkerThaumcraft { @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { TConstruct.logger.info("Thaumcraft detected. Registering harvestables."); sendIMC(); registerModifiers(); } - private void sendIMC() - { + private void sendIMC() { FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 12)); FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 13)); FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 14)); FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 15)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12)); - FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13)); + FMLInterModComms.sendMessage( + "Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 12)); + FMLInterModComms.sendMessage( + "Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerrySecond, 1, 13)); } - private void registerModifiers() - { + private void registerModifiers() { ItemStack thaumometer = ItemApi.getItem("itemThaumometer", 0); - if(thaumometer != null) { + if (thaumometer != null) { // Thaumometer Vision! ModifyBuilder.registerModifier(new AModThaumicVision(thaumometer)); } diff --git a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java index 8016b34bc37..997e213e79d 100644 --- a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java +++ b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java @@ -9,48 +9,47 @@ import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -@Pulse(id = "Tinkers FMP Compatibility", description = "Makes Tinkers Blocks Multipart compatible", modsRequired = "ForgeMultipart", forced = true) +@Pulse( + id = "Tinkers FMP Compatibility", + description = "Makes Tinkers Blocks Multipart compatible", + modsRequired = "ForgeMultipart", + forced = true) public class TinkerFMP { @Handler - public void init(FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { TConstruct.logger.info("ForgeMultipart detected. Registering TConstruct decorative blocks with FMP."); - //make Tconstruct blocks multipartable! - if(TinkerWorld.metalBlock != null) { + // make Tconstruct blocks multipartable! + if (TinkerWorld.metalBlock != null) { // metal blocks - for (int i = 0; i < 11; i++) - BlockMicroMaterial.createAndRegister(TinkerWorld.metalBlock, i); + for (int i = 0; i < 11; i++) BlockMicroMaterial.createAndRegister(TinkerWorld.metalBlock, i); } - if(TinkerSmeltery.smeltery != null) { + if (TinkerSmeltery.smeltery != null) { // smeltery bricks for (int i = 2; i < 12; i++) { - if (i == 3) - continue; + if (i == 3) continue; BlockMicroMaterial.createAndRegister(TinkerSmeltery.smeltery, i); - BlockMicroMaterial.createAndRegister(TinkerSmeltery.smelteryNether, i, TinkerSmeltery.smelteryNether.getUnlocalizedName() + "Nether"); + BlockMicroMaterial.createAndRegister( + TinkerSmeltery.smelteryNether, + i, + TinkerSmeltery.smelteryNether.getUnlocalizedName() + "Nether"); } // brownstone - for (int i = 0; i < 7; i++) - BlockMicroMaterial.createAndRegister(TinkerSmeltery.speedBlock, i); + for (int i = 0; i < 7; i++) BlockMicroMaterial.createAndRegister(TinkerSmeltery.speedBlock, i); // clear glass BlockMicroMaterial.createAndRegister(TinkerSmeltery.clearGlass, 0); - for (int i = 0; i < 16; i++) - BlockMicroMaterial.createAndRegister(TinkerSmeltery.stainedGlassClear, i); + for (int i = 0; i < 16; i++) BlockMicroMaterial.createAndRegister(TinkerSmeltery.stainedGlassClear, i); } - if(TinkerTools.multiBrick != null) { + if (TinkerTools.multiBrick != null) { // chisel bricks - for (int i = 0; i < 14; i++) - BlockMicroMaterial.createAndRegister(TinkerTools.multiBrick, i); + for (int i = 0; i < 14; i++) BlockMicroMaterial.createAndRegister(TinkerTools.multiBrick, i); - for (int i = 0; i < 16; i++) - BlockMicroMaterial.createAndRegister(TinkerTools.multiBrickFancy, i); + for (int i = 0; i < 16; i++) BlockMicroMaterial.createAndRegister(TinkerTools.multiBrickFancy, i); } - } } diff --git a/src/main/java/tconstruct/plugins/gears/TinkerGears.java b/src/main/java/tconstruct/plugins/gears/TinkerGears.java index 8d498a54656..19ecfae1f34 100644 --- a/src/main/java/tconstruct/plugins/gears/TinkerGears.java +++ b/src/main/java/tconstruct/plugins/gears/TinkerGears.java @@ -3,6 +3,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import java.util.List; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import net.minecraft.item.Item; @@ -16,14 +17,12 @@ import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.tools.items.Pattern; import tconstruct.util.config.PHConstruct; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -@Pulse(id = "Tinkers Gears", description = "Adds a gear cast if other mods provide gears", pulsesRequired = "Tinkers' Smeltery") +@Pulse( + id = "Tinkers Gears", + description = "Adds a gear cast if other mods provide gears", + pulsesRequired = "Tinkers' Smeltery") public class TinkerGears { public static Item gearCast; @@ -40,22 +39,21 @@ public void postInit(FMLPostInitializationEvent event) { ItemStack cast = new ItemStack(gearCast); FluidStack aluCastLiquid = new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue); FluidStack goldCastLiquid = null; - if(!PHConstruct.removeGoldCastRecipes) { - goldCastLiquid = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue*2); + if (!PHConstruct.removeGoldCastRecipes) { + goldCastLiquid = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2); } // find all gears in the registry - for(String oreName : OreDictionary.getOreNames()) { - if(!oreName.startsWith("gear")) - continue; + for (String oreName : OreDictionary.getOreNames()) { + if (!oreName.startsWith("gear")) continue; List gears = OreDictionary.getOres(oreName); // register every gear besides wooden gear for creating a gear cast - if(!oreName.equals("gearWood")) { - for(ItemStack g : gears) { + if (!oreName.equals("gearWood")) { + for (ItemStack g : gears) { TConstructRegistry.getTableCasting().addCastingRecipe(cast, aluCastLiquid, g, false, 50); - if(!PHConstruct.removeGoldCastRecipes) + if (!PHConstruct.removeGoldCastRecipes) TConstructRegistry.getTableCasting().addCastingRecipe(cast, goldCastLiquid, g, false, 50); } } @@ -65,24 +63,20 @@ public void postInit(FMLPostInitializationEvent event) { // try the oredict name directly Fluid fluid = FluidRegistry.getFluid(material); // or lowercased - if(fluid == null) - fluid = FluidRegistry.getFluid(material.toLowerCase()); + if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase()); // or in the tinkers liquid format - if(fluid == null) - fluid = FluidRegistry.getFluid(material.toLowerCase() + ".molten"); + if (fluid == null) fluid = FluidRegistry.getFluid(material.toLowerCase() + ".molten"); // found one? - if(fluid != null) { + if (fluid != null) { ItemStack gear = gears.get(0); - FluidStack liquid = new FluidStack(fluid.getID(), TConstruct.ingotLiquidValue*4); + FluidStack liquid = new FluidStack(fluid.getID(), TConstruct.ingotLiquidValue * 4); // gear casting TConstructRegistry.getTableCasting().addCastingRecipe(gear, liquid, cast, 55); // and melting it back FluidType ft = FluidType.getFluidType(fluid); - if(ft != null) - Smeltery.addMelting(ft, gear, 100, TConstruct.ingotLiquidValue*4); - else - Smeltery.addMelting(gear, TinkerSmeltery.glueBlock, 0, 100, liquid); + if (ft != null) Smeltery.addMelting(ft, gear, 100, TConstruct.ingotLiquidValue * 4); + else Smeltery.addMelting(gear, TinkerSmeltery.glueBlock, 0, 100, liquid); } } } diff --git a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java index 54f5d762729..5c915b9c256 100644 --- a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java +++ b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java @@ -11,24 +11,26 @@ import tconstruct.library.crafting.LiquidCasting; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers IC2 Compatibility", description = "Tinkers Construct compatibility for IndustrialCraft 2", modsRequired = "IC2", forced = true) -public class TinkerIC2 -{ +@Pulse( + id = "Tinkers IC2 Compatibility", + description = "Tinkers Construct compatibility for IndustrialCraft 2", + modsRequired = "IC2", + forced = true) +public class TinkerIC2 { private static final String IC2_UUM_FLUIDNAME = "ic2fluiduumatter"; @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { TConstruct.logger.info("IC2 detected. Preparing for shenanigans."); Fluid fluidUUM = FluidRegistry.getFluid(IC2_UUM_FLUIDNAME); - if (fluidUUM == null) - return; + if (fluidUUM == null) return; FluidStack fluidStackBlock = new FluidStack(fluidUUM, 4500); LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); // Block casting - basinCasting.addCastingRecipe(new ItemStack(Blocks.diamond_block), fluidStackBlock, new ItemStack(Blocks.dirt), true, 50); + basinCasting.addCastingRecipe( + new ItemStack(Blocks.diamond_block), fluidStackBlock, new ItemStack(Blocks.dirt), true, 50); } } diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java index 463663689b2..1e10040cd3f 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java @@ -7,37 +7,56 @@ import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2", forced = true) -public class TinkerAE2 -{ - private static List spatialIOLogics = Arrays.asList("EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these? - "MultiServantLogic"); //TODO Should Mantle handle this? - - private static List spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic"); - - private static List spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic", "StencilTableLogic", "ToolForgeLogic", "ToolStationLogic"); +@Pulse( + id = "Tinkers AE2 Compatibility", + description = "Tinkers Construct compatibility for Applied Energistics 2", + modsRequired = "appliedenergistics2", + forced = true) +public class TinkerAE2 { + private static List spatialIOLogics = Arrays.asList( + "EssenceExtractorLogic", + "GolemPedestalLogic", // TODO What happened to these? + "MultiServantLogic"); // TODO Should Mantle handle this? + + private static List spatialIOSmelteryLogics = Arrays.asList( + "AdaptiveSmelteryLogic", + "AqueductLogic", + "CastingBasinLogic", + "CastingChannelLogic", + "CastingTableLogic", + "FaucetLogic", + "LavaTankLogic", + "SmelteryDrainLogic", + "SmelteryLogic", + "TankAirLogic", + "TowerFurnaceLogic"); + + private static List spatialIOToolLogics = Arrays.asList( + "CraftingStationLogic", + "FrypanLogic", + "PartBuilderLogic", + "PatternChestLogic", + "StencilTableLogic", + "ToolForgeLogic", + "ToolStationLogic"); @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { TConstruct.logger.info("AE2 detected. Registering for Spatial IO."); addtoSpatialWhitelist("tconstruct.blocks.logic.DryingRackLogic"); addtoSpatialWhitelist("tconstruct.mechworks.logic.TileEntityLandmine"); - for (String s : spatialIOSmelteryLogics) - { + for (String s : spatialIOSmelteryLogics) { addtoSpatialWhitelist("tconstruct.smeltery.logic." + s); } - for (String s : spatialIOToolLogics) - { + for (String s : spatialIOToolLogics) { addtoSpatialWhitelist("tconstruct.tools.logic." + s); } } - public void addtoSpatialWhitelist (String teClass) - { + public void addtoSpatialWhitelist(String teClass) { FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", teClass); } } diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java index 973bce6f2d3..2674d57c013 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java @@ -1,25 +1,25 @@ package tconstruct.plugins.imc; import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import mantle.pulsar.pulse.*; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; -@Pulse(id = "Tinkers BuildCraft Compatibility", description = "Tinkers Construct compatibility for BC Transport", modsRequired = "BuildCraft|Transport", forced = true) -public class TinkerBuildCraft -{ +@Pulse( + id = "Tinkers BuildCraft Compatibility", + description = "Tinkers Construct compatibility for BC Transport", + modsRequired = "BuildCraft|Transport", + forced = true) +public class TinkerBuildCraft { @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { TConstruct.logger.info("BuildCraft detected. Registering facades."); // Smeltery Blocks addFacade(TinkerSmeltery.smeltery, 2); addFacade(TinkerSmeltery.smelteryNether, 2); - for (int sc = 4; sc < 11; sc++) - { + for (int sc = 4; sc < 11; sc++) { addFacade(TinkerSmeltery.smeltery, sc); addFacade(TinkerSmeltery.smelteryNether, sc); } @@ -28,8 +28,7 @@ public void init (FMLInitializationEvent event) addFacade(TinkerSmeltery.searedBlockNether, 0); } - private void addFacade (Block b, int meta) - { + private void addFacade(Block b, int meta) { FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", new ItemStack(b, 1, meta)); } } diff --git a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java index 755f9032191..ec87dd4cc5f 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java @@ -1,49 +1,49 @@ package tconstruct.plugins.imc; +import static tconstruct.smeltery.TinkerSmeltery.*; + import cpw.mods.fml.common.event.*; import mantle.pulsar.pulse.*; import net.minecraftforge.fluids.Fluid; import tconstruct.TConstruct; -import static tconstruct.smeltery.TinkerSmeltery.*; - -@Pulse(id = "Tinkers Mystcraft Compatibility", forced = true, modsRequired = "Mystcraft", pulsesRequired = "Tinkers' Smeltery") -public class TinkerMystcraft -{ +@Pulse( + id = "Tinkers Mystcraft Compatibility", + forced = true, + modsRequired = "Mystcraft", + pulsesRequired = "Tinkers' Smeltery") +public class TinkerMystcraft { @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { final Fluid[] fluids = new Fluid[] { - // precious tinker fluids - moltenGoldFluid, - moltenSteelFluid, - moltenEmeraldFluid, - moltenQuartzFluid, - moltenArditeFluid, - moltenCobaltFluid, - // all alloys - pigIronFluid, - moltenBronzeFluid, - moltenAlumiteFluid, - moltenAlubrassFluid, - moltenManyullynFluid, - // precious TE fluids - moltenEnderFluid, - moltenSilverFluid, - moltenInvarFluid, - moltenElectrumFluid, - moltenShinyFluid, - moltenSignalumFluid, - moltenLumiumFluid, - moltenMithrilFluid, - moltenEnderiumFluid + // precious tinker fluids + moltenGoldFluid, + moltenSteelFluid, + moltenEmeraldFluid, + moltenQuartzFluid, + moltenArditeFluid, + moltenCobaltFluid, + // all alloys + pigIronFluid, + moltenBronzeFluid, + moltenAlumiteFluid, + moltenAlubrassFluid, + moltenManyullynFluid, + // precious TE fluids + moltenEnderFluid, + moltenSilverFluid, + moltenInvarFluid, + moltenElectrumFluid, + moltenShinyFluid, + moltenSignalumFluid, + moltenLumiumFluid, + moltenMithrilFluid, + moltenEnderiumFluid }; TConstruct.logger.info("Mystcraft detected. Blacklisting Mystcraft fluid symbols."); - for(Fluid fluid : fluids) - { - if(fluid == null) - continue; + for (Fluid fluid : fluids) { + if (fluid == null) continue; FMLInterModComms.sendMessage("Mystcraft", "blacklistfluid", fluid.getName()); } } diff --git a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java index dbde4bd1037..ee095a55a8c 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java @@ -1,5 +1,8 @@ package tconstruct.plugins.imc; +import static tconstruct.smeltery.TinkerSmeltery.*; +import static tconstruct.smeltery.TinkerSmeltery.moltenEnderiumFluid; + import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import mantle.pulsar.pulse.Handler; @@ -7,12 +10,9 @@ import net.minecraftforge.fluids.Fluid; import tconstruct.world.TinkerWorld; -import static tconstruct.smeltery.TinkerSmeltery.*; -import static tconstruct.smeltery.TinkerSmeltery.moltenEnderiumFluid; - @Pulse(id = "Tinkers RF-Tools Compatibility", forced = true, modsRequired = TinkerRfTools.modid) public class TinkerRfTools { - final static String modid = "rftools"; + static final String modid = "rftools"; @Handler public void preInit(FMLPreInitializationEvent event) { @@ -40,41 +40,73 @@ public void preInit(FMLPreInitializationEvent event) { configure(moltenSilverFluid, 45678, 14321, 1234, 6); // configure availability - preventLoot(moltenSteelFluid, moltenGoldFluid, moltenEnderFluid, moltenArditeFluid, moltenCobaltFluid, moltenSilverFluid, moltenEmeraldFluid, moltenQuartzFluid); - preventGen(moltenCobaltFluid, moltenArditeFluid, moltenSteelFluid, moltenGoldFluid, moltenEmeraldFluid, moltenIronFluid, moltenQuartzFluid); + preventLoot( + moltenSteelFluid, + moltenGoldFluid, + moltenEnderFluid, + moltenArditeFluid, + moltenCobaltFluid, + moltenSilverFluid, + moltenEmeraldFluid, + moltenQuartzFluid); + preventGen( + moltenCobaltFluid, + moltenArditeFluid, + moltenSteelFluid, + moltenGoldFluid, + moltenEmeraldFluid, + moltenIronFluid, + moltenQuartzFluid); // configure ores - if(TinkerWorld.oreSlag != null) { - FMLInterModComms.sendMessage(modid, "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore1", 500000, 25000, 15000, 5)); - FMLInterModComms.sendMessage(modid, "dimlet_preventloot", String.format("Material.%s", "tile.tconstruct.stoneore1")); - FMLInterModComms.sendMessage(modid, "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore2", 400000, 20000, 10000, 5)); - FMLInterModComms.sendMessage(modid, "dimlet_preventloot", String.format("Material.%s", "tile.tconstruct.stoneore2")); - FMLInterModComms.sendMessage(modid, "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore3", 10000, 3000, 1000, 3)); - FMLInterModComms.sendMessage(modid, "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore4", 12000, 3333, 5000, 3)); - FMLInterModComms.sendMessage(modid, "dimlet_configure", String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore5", 10000, 2800, 500, 3)); + if (TinkerWorld.oreSlag != null) { + FMLInterModComms.sendMessage( + modid, + "dimlet_configure", + String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore1", 500000, 25000, 15000, 5)); + FMLInterModComms.sendMessage( + modid, "dimlet_preventloot", String.format("Material.%s", "tile.tconstruct.stoneore1")); + FMLInterModComms.sendMessage( + modid, + "dimlet_configure", + String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore2", 400000, 20000, 10000, 5)); + FMLInterModComms.sendMessage( + modid, "dimlet_preventloot", String.format("Material.%s", "tile.tconstruct.stoneore2")); + FMLInterModComms.sendMessage( + modid, + "dimlet_configure", + String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore3", 10000, 3000, 1000, 3)); + FMLInterModComms.sendMessage( + modid, + "dimlet_configure", + String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore4", 12000, 3333, 5000, 3)); + FMLInterModComms.sendMessage( + modid, + "dimlet_configure", + String.format("Material.%s=%d,%d,%d,%d", "tile.tconstruct.stoneore5", 10000, 2800, 500, 3)); } } private void configure(Fluid fluid, int create, int maintain, int ticks, int rarity) { - if(fluid == null) - return; + if (fluid == null) return; - FMLInterModComms.sendMessage(modid, "dimlet_configure", String.format("Liquid.%s=%d,%d,%d,%d", fluid.getName(), create, maintain, ticks, rarity)); + FMLInterModComms.sendMessage( + modid, + "dimlet_configure", + String.format("Liquid.%s=%d,%d,%d,%d", fluid.getName(), create, maintain, ticks, rarity)); } private void preventLoot(Fluid... fluids) { - for(Fluid fluid : fluids) { - if (fluid == null) - continue; + for (Fluid fluid : fluids) { + if (fluid == null) continue; FMLInterModComms.sendMessage(modid, "dimlet_preventloot", String.format("Liquid.%s", fluid.getName())); } } private void preventGen(Fluid... fluids) { - for(Fluid fluid : fluids) { - if (fluid == null) - continue; + for (Fluid fluid : fluids) { + if (fluid == null) continue; FMLInterModComms.sendMessage(modid, "dimlet_preventworldgen", String.format("Liquid.%s", fluid.getName())); } @@ -83,37 +115,41 @@ private void preventGen(Fluid... fluids) { private void blacklist() { // blacklist alloys final Fluid[] fluidBlacklist = { - // all alloys - pigIronFluid, - moltenBronzeFluid, - moltenAlumiteFluid, - moltenAlubrassFluid, - moltenManyullynFluid, - moltenInvarFluid, - moltenElectrumFluid, - moltenSignalumFluid, - moltenLumiumFluid, - moltenMithrilFluid, - moltenEnderiumFluid, - // and shiny - moltenShinyFluid + // all alloys + pigIronFluid, + moltenBronzeFluid, + moltenAlumiteFluid, + moltenAlubrassFluid, + moltenManyullynFluid, + moltenInvarFluid, + moltenElectrumFluid, + moltenSignalumFluid, + moltenLumiumFluid, + moltenMithrilFluid, + moltenEnderiumFluid, + // and shiny + moltenShinyFluid }; - for(Fluid fluid : fluidBlacklist) { - if(fluid == null) - continue; + for (Fluid fluid : fluidBlacklist) { + if (fluid == null) continue; FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Liquid." + fluid.getName()); - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Liquid." + fluid.getName() + "=999999,999999,999999,6"); + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Liquid." + fluid.getName() + "=999999,999999,999999,6"); FMLInterModComms.sendMessage(modid, "dimlet_preventworldgen", "Liquid." + fluid.getName()); FMLInterModComms.sendMessage(modid, "dimlet_preventloot", "Liquid." + fluid.getName()); } // blacklist oreberry bushes - if(TinkerWorld.oreBerry != null) { - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Material." + "tile.ore.berries.one=123456,123456,123456,6"); - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Material." + "tile.ore.berries.one1=123456,123456,123456,6"); - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Material." + "tile.ore.berries.one2=123456,123456,123456,6"); - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Material." + "tile.ore.berries.one3=123456,123456,123456,6"); + if (TinkerWorld.oreBerry != null) { + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Material." + "tile.ore.berries.one=123456,123456,123456,6"); + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Material." + "tile.ore.berries.one1=123456,123456,123456,6"); + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Material." + "tile.ore.berries.one2=123456,123456,123456,6"); + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Material." + "tile.ore.berries.one3=123456,123456,123456,6"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.one"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.one1"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.one2"); @@ -127,9 +163,11 @@ private void blacklist() { FMLInterModComms.sendMessage(modid, "dimlet_preventloot", "Material." + "tile.ore.berries.one2"); FMLInterModComms.sendMessage(modid, "dimlet_preventloot", "Material." + "tile.ore.berries.one3"); } - if(TinkerWorld.oreBerrySecond != null) { - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Material." + "tile.ore.berries.two=123456,123456,123456,6"); - FMLInterModComms.sendMessage(modid, "dimlet_configure", "Material." + "tile.ore.berries.two1=123456,123456,123456,6"); + if (TinkerWorld.oreBerrySecond != null) { + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Material." + "tile.ore.berries.two=123456,123456,123456,6"); + FMLInterModComms.sendMessage( + modid, "dimlet_configure", "Material." + "tile.ore.berries.two1=123456,123456,123456,6"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.two"); FMLInterModComms.sendMessage(modid, "dimlet_blacklist", "Material." + "tile.ore.berries.two1"); FMLInterModComms.sendMessage(modid, "dimlet_preventworldgen", "Material." + "tile.ore.berries.two"); diff --git a/src/main/java/tconstruct/plugins/mfr/Drinkables.java b/src/main/java/tconstruct/plugins/mfr/Drinkables.java index f5925e88490..b8292ede9de 100644 --- a/src/main/java/tconstruct/plugins/mfr/Drinkables.java +++ b/src/main/java/tconstruct/plugins/mfr/Drinkables.java @@ -4,22 +4,16 @@ import net.minecraft.potion.*; import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler; -public class Drinkables implements ILiquidDrinkHandler -{ +public class Drinkables implements ILiquidDrinkHandler { @Override - public void onDrink (EntityLivingBase entity) - { - //boost health when drink - if (entity != null) - { + public void onDrink(EntityLivingBase entity) { + // boost health when drink + if (entity != null) { PotionEffect potion = entity.getActivePotionEffect(Potion.field_76434_w); int duration = 0; - if (potion != null) - duration = potion.getDuration(); + if (potion != null) duration = potion.getDuration(); entity.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 30, 0)); } - } - } diff --git a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java index 267a70b5970..1d5b931f47a 100644 --- a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java @@ -8,17 +8,14 @@ import powercrystals.minefactoryreloaded.api.*; import tconstruct.tools.TinkerTools; -public class GrindableHorse implements IFactoryGrindable -{ +public class GrindableHorse implements IFactoryGrindable { @Override - public Class getGrindableEntity () - { + public Class getGrindableEntity() { return EntityHorse.class; } @Override - public List grind (World world, EntityLivingBase entity, Random random) - { + public List grind(World world, EntityLivingBase entity, Random random) { List drops = new ArrayList(); drops.add(new MobDrop(10, new ItemStack(TinkerTools.materials, random.nextInt(4) + 1, 36))); @@ -27,8 +24,7 @@ public List grind (World world, EntityLivingBase entity, Random random) } @Override - public boolean processEntity (EntityLivingBase entity) - { + public boolean processEntity(EntityLivingBase entity) { return false; } } diff --git a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java index e0ad176a90e..953f6d6af73 100644 --- a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java +++ b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java @@ -6,58 +6,49 @@ import net.minecraft.world.World; import powercrystals.minefactoryreloaded.api.*; -public class HarvestableOreBerry implements IFactoryHarvestable -{ +public class HarvestableOreBerry implements IFactoryHarvestable { private Block _sourceBlock; private Item _berryItem; private int _metaOffset; - public HarvestableOreBerry(Block sourceBlock, Item berryItem, int metaOffset) - { + public HarvestableOreBerry(Block sourceBlock, Item berryItem, int metaOffset) { _sourceBlock = sourceBlock; _berryItem = berryItem; _metaOffset = metaOffset; } @Override - public Block getPlant () - { + public Block getPlant() { return _sourceBlock; } @Override - public HarvestType getHarvestType () - { + public HarvestType getHarvestType() { return HarvestType.Column; } @Override - public boolean breakBlock () - { + public boolean breakBlock() { return false; } @Override - public boolean canBeHarvested (World world, Map harvesterSettings, int x, int y, int z) - { + public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z) { return world.getBlockMetadata(x, y, z) >= 12; } @Override - public List getDrops (World world, Random rand, Map harvesterSettings, int x, int y, int z) - { - ItemStack[] returnItems = { new ItemStack(_berryItem, 1, world.getBlockMetadata(x, y, z) % 4 + _metaOffset) }; + public List getDrops( + World world, Random rand, Map harvesterSettings, int x, int y, int z) { + ItemStack[] returnItems = {new ItemStack(_berryItem, 1, world.getBlockMetadata(x, y, z) % 4 + _metaOffset)}; return Arrays.asList(returnItems); } @Override - public void preHarvest (World world, int x, int y, int z) - { - } + public void preHarvest(World world, int x, int y, int z) {} @Override - public void postHarvest (World world, int x, int y, int z) - { + public void postHarvest(World world, int x, int y, int z) { world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) - 4, 2); } } diff --git a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java index 28c69f1304d..4b9b1a76308 100644 --- a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java +++ b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java @@ -4,13 +4,14 @@ import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; -public class MFRRegister -{ - public static void registerWithMFR () - { - FactoryRegistry.sendMessage("registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerry, TinkerWorld.oreBerries, 0)); - FactoryRegistry.sendMessage("registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerrySecond, TinkerWorld.oreBerries, 4)); +public class MFRRegister { + public static void registerWithMFR() { + FactoryRegistry.sendMessage( + "registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerry, TinkerWorld.oreBerries, 0)); + FactoryRegistry.sendMessage( + "registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerrySecond, TinkerWorld.oreBerries, 4)); FactoryRegistry.sendMessage("registerGrindable", new GrindableHorse()); - FactoryRegistry.sendMessage("registerLiquidDrinkHandler", new ValuedItem(TinkerSmeltery.bloodFluid.getName(), new Drinkables())); + FactoryRegistry.sendMessage( + "registerLiquidDrinkHandler", new ValuedItem(TinkerSmeltery.bloodFluid.getName(), new Drinkables())); } } diff --git a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java index d49406dda7b..427b7c191af 100644 --- a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java +++ b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java @@ -6,13 +6,16 @@ import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers MFR Compatibility", description = "Tinkers Construct compatibility for MineFactory Reloaded", modsRequired = "MineFactoryReloaded", forced = true) -public class TinkerMFR -{ +@Pulse( + id = "Tinkers MFR Compatibility", + description = "Tinkers Construct compatibility for MineFactory Reloaded", + modsRequired = "MineFactoryReloaded", + forced = true) +public class TinkerMFR { @Handler - public void init (FMLInitializationEvent event) - { - TConstruct.logger.info("MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); + public void init(FMLInitializationEvent event) { + TConstruct.logger.info( + "MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry."); MFRRegister.registerWithMFR(); /* * Perhaps TC ores should be registered as drops from the MFR Laser Drill here, but I don't know which things would be suitable for that. @@ -20,4 +23,4 @@ public void init (FMLInitializationEvent event) * Currently used weights are from about 50 (emerald) to 175 (coal). */ } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java index ac0e998e166..f6f77e41ae8 100644 --- a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java +++ b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java @@ -1,69 +1,60 @@ -package tconstruct.plugins.nei; - -import codechicken.nei.NEIClientConfig; -import codechicken.nei.api.API; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import net.minecraft.client.gui.inventory.GuiContainer; -import tconstruct.client.ArmorControls; - -public class BeltToggleFromGuiInputHandler implements IContainerInputHandler { - - static final String KEY_IDENTIFIER = "gui.tinkers_belt"; - public static void init() { - API.addKeyBind(KEY_IDENTIFIER, 0); - GuiContainerManager.addInputHandler(new BeltToggleFromGuiInputHandler()); - } - - @Override - public boolean keyTyped(GuiContainer guiContainer, char c, int i) { - if (i == 0) { - return false; - } - final int keyBinding = NEIClientConfig.getKeyBinding(KEY_IDENTIFIER); - if (keyBinding == 0 || i != keyBinding) { - return false; - } - return ArmorControls.doBeltSwapIfPossible(); - } - - @Override - public void onKeyTyped(GuiContainer guiContainer, char c, int i) { - - } - - @Override - public boolean lastKeyTyped(GuiContainer guiContainer, char c, int i) { - return false; - } - - @Override - public boolean mouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { - return false; - } - - @Override - public void onMouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { - - } - - @Override - public void onMouseUp(GuiContainer guiContainer, int i, int i1, int i2) { - - } - - @Override - public boolean mouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { - return false; - } - - @Override - public void onMouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { - - } - - @Override - public void onMouseDragged(GuiContainer guiContainer, int i, int i1, int i2, long l) { - - } -} +package tconstruct.plugins.nei; + +import codechicken.nei.NEIClientConfig; +import codechicken.nei.api.API; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerInputHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import tconstruct.client.ArmorControls; + +public class BeltToggleFromGuiInputHandler implements IContainerInputHandler { + + static final String KEY_IDENTIFIER = "gui.tinkers_belt"; + + public static void init() { + API.addKeyBind(KEY_IDENTIFIER, 0); + GuiContainerManager.addInputHandler(new BeltToggleFromGuiInputHandler()); + } + + @Override + public boolean keyTyped(GuiContainer guiContainer, char c, int i) { + if (i == 0) { + return false; + } + final int keyBinding = NEIClientConfig.getKeyBinding(KEY_IDENTIFIER); + if (keyBinding == 0 || i != keyBinding) { + return false; + } + return ArmorControls.doBeltSwapIfPossible(); + } + + @Override + public void onKeyTyped(GuiContainer guiContainer, char c, int i) {} + + @Override + public boolean lastKeyTyped(GuiContainer guiContainer, char c, int i) { + return false; + } + + @Override + public boolean mouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { + return false; + } + + @Override + public void onMouseClicked(GuiContainer guiContainer, int i, int i1, int i2) {} + + @Override + public void onMouseUp(GuiContainer guiContainer, int i, int i1, int i2) {} + + @Override + public boolean mouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { + return false; + } + + @Override + public void onMouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) {} + + @Override + public void onMouseDragged(GuiContainer guiContainer, int i, int i1, int i2, long l) {} +} diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java index 4ae7d45a08c..0a3aa4dc71f 100644 --- a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java +++ b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java @@ -11,16 +11,14 @@ /** * Modified copy of DefaultOverlayHandler from NotEnoughItems */ -public class CraftingStationOverlayHandler extends DefaultOverlayHandler -{ +public class CraftingStationOverlayHandler extends DefaultOverlayHandler { @Override public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift) { - if(gui.inventorySlots instanceof CraftingStationContainer) { - final CraftingStationContainer station = (CraftingStationContainer)gui.inventorySlots; - if(station.logic.chest != null && gui instanceof CraftingStationGui) { - offsetx = 5 + ((CraftingStationGui)gui).getChestWidth(); - } - else { + if (gui.inventorySlots instanceof CraftingStationContainer) { + final CraftingStationContainer station = (CraftingStationContainer) gui.inventorySlots; + if (station.logic.chest != null && gui instanceof CraftingStationGui) { + offsetx = 5 + ((CraftingStationGui) gui).getChestWidth(); + } else { offsetx = 5; } } @@ -30,12 +28,10 @@ public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeInd @Override public boolean canMoveFrom(Slot slot, GuiContainer gui) { - if(gui.inventorySlots instanceof CraftingStationContainer) { + if (gui.inventorySlots instanceof CraftingStationContainer) { CraftingStationLogic logic = ((CraftingStationContainer) gui.inventorySlots).logic; - if(logic.chest != null && slot.inventory == logic.chest.get()) - return true; - if(logic.doubleChest != null && slot.inventory == logic.doubleChest.get()) - return true; + if (logic.chest != null && slot.inventory == logic.chest.get()) return true; + if (logic.doubleChest != null && slot.inventory == logic.doubleChest.get()) return true; } return super.canMoveFrom(slot, gui); diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java index fcc8b10da81..2a4c01789bb 100644 --- a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java +++ b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java @@ -3,16 +3,15 @@ import codechicken.nei.PositionedStack; import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.GuiRecipe; +import java.util.ArrayList; import net.minecraft.client.Minecraft; import tconstruct.TConstruct; import tconstruct.tools.gui.CraftingStationGui; -import java.util.ArrayList; - public class CraftingStationStackPositioner implements IStackPositioner { @Override - public ArrayList positionStacks (ArrayList stacks) { + public ArrayList positionStacks(ArrayList stacks) { if (Minecraft.getMinecraft().currentScreen instanceof GuiRecipe) { GuiRecipe recipeGui = (GuiRecipe) Minecraft.getMinecraft().currentScreen; @@ -35,5 +34,4 @@ public ArrayList positionStacks (ArrayList sta return stacks; } - } diff --git a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java index aeb89ac9e62..b475f38dca1 100644 --- a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java +++ b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java @@ -1,15 +1,13 @@ package tconstruct.plugins.nei; -import tconstruct.tools.gui.CraftingStationGui; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import tconstruct.tools.gui.CraftingStationGui; -public class NEITConstructConfig implements IConfigureNEI -{ +public class NEITConstructConfig implements IConfigureNEI { @Override - public void loadConfig () - { + public void loadConfig() { API.registerGuiOverlay(CraftingStationGui.class, "crafting", new CraftingStationStackPositioner()); API.registerGuiOverlayHandler(CraftingStationGui.class, new CraftingStationOverlayHandler(), "crafting"); @@ -24,21 +22,17 @@ public void loadConfig () } @Override - public String getName () - { + public String getName() { return "TConstruct"; } @Override - public String getVersion () - { + public String getVersion() { return "${version}"; } - private static void registerHandler (RecipeHandlerBase handler) - { + private static void registerHandler(RecipeHandlerBase handler) { API.registerRecipeHandler(handler); API.registerUsageHandler(handler); } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index 98de1b3f7f6..84f5217440f 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -1,46 +1,36 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import net.minecraft.util.StatCollector; - import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; - import tconstruct.library.crafting.AlloyMix; import tconstruct.library.crafting.Smeltery; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -public class RecipeHandlerAlloying extends RecipeHandlerBase -{ +public class RecipeHandlerAlloying extends RecipeHandlerBase { public static final Rectangle OUTPUT_TANK = new Rectangle(118, 9, 18, 32); - public class CachedAlloyingRecipe extends CachedBaseRecipe - { + public class CachedAlloyingRecipe extends CachedBaseRecipe { private List fluidTanks; private int minAmount; - public CachedAlloyingRecipe(AlloyMix recipe) - { + public CachedAlloyingRecipe(AlloyMix recipe) { this.fluidTanks = new ArrayList(); int maxAmount = recipe.mixers.get(0).amount; int mult = 1; this.minAmount = maxAmount; - for (FluidStack stack : recipe.mixers) - { - if (stack.amount > maxAmount) - { + for (FluidStack stack : recipe.mixers) { + if (stack.amount > maxAmount) { maxAmount = stack.amount; } - if (stack.amount < this.minAmount) - { + if (stack.amount < this.minAmount) { this.minAmount = stack.amount; } } @@ -50,15 +40,13 @@ public CachedAlloyingRecipe(AlloyMix recipe) int width = 36 / recipe.mixers.size(); int counter = 0; - for (FluidStack stack : recipe.mixers) - { - if (counter == recipe.mixers.size() - 1) - { - tank = new FluidTankElement(new Rectangle(21 + width * counter, 9, 36 - width * counter, 32), maxAmount * mult, stack); - } - else - { - tank = new FluidTankElement(new Rectangle(21 + width * counter, 9, width, 32), maxAmount * mult, stack); + for (FluidStack stack : recipe.mixers) { + if (counter == recipe.mixers.size() - 1) { + tank = new FluidTankElement( + new Rectangle(21 + width * counter, 9, 36 - width * counter, 32), maxAmount * mult, stack); + } else { + tank = new FluidTankElement( + new Rectangle(21 + width * counter, 9, width, 32), maxAmount * mult, stack); } tank.fluid.amount *= mult; this.fluidTanks.add(tank); @@ -67,102 +55,81 @@ public CachedAlloyingRecipe(AlloyMix recipe) } @Override - public PositionedStack getIngredient () - { + public PositionedStack getIngredient() { return null; } @Override - public PositionedStack getResult () - { + public PositionedStack getResult() { return null; } @Override - public List getFluidTanks () - { + public List getFluidTanks() { return this.fluidTanks; } } @Override - public String getRecipeName () - { + public String getRecipeName() { return StatCollector.translateToLocal("tconstruct.nei.alloying"); } @Override - public String getRecipeID () - { + public String getRecipeID() { return "tconstruct.smeltery.alloying"; } @Override - public String getGuiTexture () - { + public String getGuiTexture() { return "tinker:textures/gui/nei/smeltery.png"; } @Override - public void loadTransferRects () - { - this.transferRects.add(new RecipeTransferRect(new Rectangle(76, 21, 22, 15), this.getRecipeID(), new Object[0])); + public void loadTransferRects() { + this.transferRects.add( + new RecipeTransferRect(new Rectangle(76, 21, 22, 15), this.getRecipeID(), new Object[0])); } @Override - public void drawBackground (int recipe) - { + public void drawBackground(int recipe) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(this.getGuiTexture()); GuiDraw.drawTexturedModalRect(0, 0, 0, 62, 160, 65); } @Override - public void loadCraftingRecipes (String outputId, Object... results) - { - if (outputId.equals(this.getRecipeID())) - { - for (AlloyMix recipe : Smeltery.getAlloyList()) - { - if (!recipe.mixers.isEmpty()) - { + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(this.getRecipeID())) { + for (AlloyMix recipe : Smeltery.getAlloyList()) { + if (!recipe.mixers.isEmpty()) { this.arecipes.add(new CachedAlloyingRecipe(recipe)); } } - } - else - { + } else { super.loadCraftingRecipes(outputId, results); } } @Override - public void loadCraftingRecipes (FluidStack result) - { - for (AlloyMix recipe : Smeltery.getAlloyList()) - { - if (areFluidsEqual(recipe.result, result) && !recipe.mixers.isEmpty()) - { + public void loadCraftingRecipes(FluidStack result) { + for (AlloyMix recipe : Smeltery.getAlloyList()) { + if (areFluidsEqual(recipe.result, result) && !recipe.mixers.isEmpty()) { this.arecipes.add(new CachedAlloyingRecipe(recipe)); } } } @Override - public void loadUsageRecipes (FluidStack ingredient) - { - for (Iterator i = Smeltery.getAlloyList().iterator(); i.hasNext();) - { + public void loadUsageRecipes(FluidStack ingredient) { + for (Iterator i = Smeltery.getAlloyList().iterator(); i.hasNext(); ) { AlloyMix recipe = i.next(); - for (FluidStack liquid : recipe.mixers) - { - if (areFluidsEqual(liquid, ingredient) && !recipe.mixers.isEmpty()) - { + for (FluidStack liquid : recipe.mixers) { + if (areFluidsEqual(liquid, ingredient) && !recipe.mixers.isEmpty()) { this.arecipes.add(new CachedAlloyingRecipe(recipe)); break; } } } } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java index 20da696e957..76165c8ed66 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java @@ -1,10 +1,16 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; import java.awt.Point; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -17,122 +23,82 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidContainerItem; - import org.lwjgl.opengl.GL11; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class RecipeHandlerBase extends TemplateRecipeHandler -{ +public abstract class RecipeHandlerBase extends TemplateRecipeHandler { - public abstract class CachedBaseRecipe extends CachedRecipe - { - public List getFluidTanks () - { + public abstract class CachedBaseRecipe extends CachedRecipe { + public List getFluidTanks() { return null; } } - public abstract String getRecipeID (); + public abstract String getRecipeID(); - public void loadCraftingRecipes (FluidStack result) - { - } + public void loadCraftingRecipes(FluidStack result) {} - public void loadUsageRecipes (FluidStack ingredient) - { - } + public void loadUsageRecipes(FluidStack ingredient) {} @Override - public void drawForeground (int recipe) - { + public void drawForeground(int recipe) { super.drawForeground(recipe); this.drawFluidTanks(recipe); } @Override - public void loadCraftingRecipes (String outputId, Object... results) - { - try - { - if (outputId.equals("liquid") && results.length == 1 && results[0] instanceof FluidStack) - { + public void loadCraftingRecipes(String outputId, Object... results) { + try { + if (outputId.equals("liquid") && results.length == 1 && results[0] instanceof FluidStack) { this.loadCraftingRecipes((FluidStack) results[0]); - } - else - { + } else { super.loadCraftingRecipes(outputId, results); } - } - catch (Throwable ex) - { + } catch (Throwable ex) { ex.printStackTrace(); } } @Override - public void loadCraftingRecipes (ItemStack result) - { + public void loadCraftingRecipes(ItemStack result) { FluidStack fluid = getFluidStack(result); - if (fluid != null) - { + if (fluid != null) { this.loadCraftingRecipes(fluid); } } @Override - public void loadUsageRecipes (String inputId, Object... ingredients) - { - try - { - if (inputId.equals("liquid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { + public void loadUsageRecipes(String inputId, Object... ingredients) { + try { + if (inputId.equals("liquid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) { this.loadUsageRecipes((FluidStack) ingredients[0]); - } - else - { + } else { super.loadUsageRecipes(inputId, ingredients); } - } - catch (Throwable ex) - { + } catch (Throwable ex) { ex.printStackTrace(); } } @Override - public void loadUsageRecipes (ItemStack ingred) - { + public void loadUsageRecipes(ItemStack ingred) { FluidStack fluid = getFluidStack(ingred); - if (fluid != null) - { + if (fluid != null) { this.loadUsageRecipes(fluid); } } @Override - public List handleTooltip (GuiRecipe guiRecipe, List currenttip, int recipe) - { + public List handleTooltip(GuiRecipe guiRecipe, List currenttip, int recipe) { super.handleTooltip(guiRecipe, currenttip, recipe); CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); - if (GuiContainerManager.shouldShowTooltip(guiRecipe)) - { + if (GuiContainerManager.shouldShowTooltip(guiRecipe)) { Point mouse = GuiDraw.getMousePosition(); Point offset = guiRecipe.getRecipePosition(recipe); Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y); - if (crecipe.getFluidTanks() != null) - { - for (FluidTankElement tank : crecipe.getFluidTanks()) - { - if (tank.position.contains(relMouse)) - { + if (crecipe.getFluidTanks() != null) { + for (FluidTankElement tank : crecipe.getFluidTanks()) { + if (tank.position.contains(relMouse)) { tank.handleTooltip(currenttip); } } @@ -142,19 +108,13 @@ public List handleTooltip (GuiRecipe guiRecipe, List currenttip, } @Override - public boolean keyTyped (GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if (this.transferFluidTank(gui, recipe, false)) - { + public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) { + if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) { + if (this.transferFluidTank(gui, recipe, false)) { return true; } - } - else if (keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if (this.transferFluidTank(gui, recipe, true)) - { + } else if (keyCode == NEIClientConfig.getKeyBinding("gui.usage")) { + if (this.transferFluidTank(gui, recipe, true)) { return true; } } @@ -162,51 +122,35 @@ else if (keyCode == NEIClientConfig.getKeyBinding("gui.usage")) } @Override - public boolean mouseClicked (GuiRecipe gui, int button, int recipe) - { - if (button == 0) - { - if (this.transferFluidTank(gui, recipe, false)) - { + public boolean mouseClicked(GuiRecipe gui, int button, int recipe) { + if (button == 0) { + if (this.transferFluidTank(gui, recipe, false)) { return true; } - } - else if (button == 1) - { - if (this.transferFluidTank(gui, recipe, true)) - { + } else if (button == 1) { + if (this.transferFluidTank(gui, recipe, true)) { return true; } } return super.mouseClicked(gui, button, recipe); } - protected boolean transferFluidTank (GuiRecipe guiRecipe, int recipe, boolean usage) - { + protected boolean transferFluidTank(GuiRecipe guiRecipe, int recipe, boolean usage) { CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); Point mouse = GuiDraw.getMousePosition(); Point offset = guiRecipe.getRecipePosition(recipe); Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y); - if (crecipe.getFluidTanks() != null) - { - for (FluidTankElement tank : crecipe.getFluidTanks()) - { - if (tank.position.contains(relMouse)) - { - if ((tank.fluid != null) && tank.fluid.amount > 0) - { - if (usage) - { - if (!GuiUsageRecipe.openRecipeGui("liquid", new Object[] { tank.fluid })) - { + if (crecipe.getFluidTanks() != null) { + for (FluidTankElement tank : crecipe.getFluidTanks()) { + if (tank.position.contains(relMouse)) { + if ((tank.fluid != null) && tank.fluid.amount > 0) { + if (usage) { + if (!GuiUsageRecipe.openRecipeGui("liquid", new Object[] {tank.fluid})) { return false; } - } - else - { - if (!GuiCraftingRecipe.openRecipeGui("liquid", new Object[] { tank.fluid })) - { + } else { + if (!GuiCraftingRecipe.openRecipeGui("liquid", new Object[] {tank.fluid})) { return false; } } @@ -219,79 +163,63 @@ protected boolean transferFluidTank (GuiRecipe guiRecipe, int recipe, boolean us return false; } - public void drawFluidTanks (int recipe) - { + public void drawFluidTanks(int recipe) { CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); - if (crecipe.getFluidTanks() != null) - { - for (FluidTankElement fluidTank : crecipe.getFluidTanks()) - { + if (crecipe.getFluidTanks() != null) { + for (FluidTankElement fluidTank : crecipe.getFluidTanks()) { fluidTank.draw(); } } } - public static List getSingleList (Object o) - { + public static List getSingleList(Object o) { List list = new ArrayList(); list.add(o); return list; } - public static FluidStack getFluidStack (ItemStack stack) - { - if (stack == null) - { + public static FluidStack getFluidStack(ItemStack stack) { + if (stack == null) { return null; } Item item = stack.getItem(); FluidStack fluidStack = null; - if ((item instanceof IFluidContainerItem)) - { + if ((item instanceof IFluidContainerItem)) { fluidStack = ((IFluidContainerItem) item).getFluid(stack); } - if (fluidStack == null) - { + if (fluidStack == null) { fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); } - if ((fluidStack == null) && (Block.getBlockFromItem(stack.getItem()) instanceof IFluidBlock)) - { + if ((fluidStack == null) && (Block.getBlockFromItem(stack.getItem()) instanceof IFluidBlock)) { Fluid fluid = ((IFluidBlock) Block.getBlockFromItem(stack.getItem())).getFluid(); - if (fluid != null) - { + if (fluid != null) { return new FluidStack(fluid, 1000); } } return fluidStack; } - public static boolean areFluidsEqual (FluidStack fluidStack1, FluidStack fluidStack2) - { - if (fluidStack1 == null || fluidStack2 == null) - { + public static boolean areFluidsEqual(FluidStack fluidStack1, FluidStack fluidStack2) { + if (fluidStack1 == null || fluidStack2 == null) { return false; } return fluidStack1.isFluidEqual(fluidStack2); } - public static class FluidTankElement - { + public static class FluidTankElement { public Rectangle position; public FluidStack fluid; public int capacity; public boolean flowingTexture = false; - public FluidTankElement(Rectangle position, int capacity, FluidStack fluid) - { + public FluidTankElement(Rectangle position, int capacity, FluidStack fluid) { this.position = position; this.capacity = capacity; this.fluid = fluid; } - public List handleTooltip (List currenttip) - { - if (this.fluid == null || this.fluid.getFluid() == null || this.fluid.amount <= 0) - { + public List handleTooltip(List currenttip) { + if (this.fluid == null || this.fluid.getFluid() == null || this.fluid.amount <= 0) { return currenttip; } currenttip.add(this.fluid.getLocalizedName()); @@ -299,23 +227,16 @@ public List handleTooltip (List currenttip) return currenttip; } - public void draw () - { - if (this.fluid == null || this.fluid.getFluid() == null || this.fluid.amount <= 0) - { + public void draw() { + if (this.fluid == null || this.fluid.getFluid() == null || this.fluid.amount <= 0) { return; } IIcon fluidIcon = null; - if (this.flowingTexture && this.fluid.getFluid().getFlowingIcon() != null) - { + if (this.flowingTexture && this.fluid.getFluid().getFlowingIcon() != null) { fluidIcon = this.fluid.getFluid().getFlowingIcon(); - } - else if (this.fluid.getFluid().getStillIcon() != null) - { + } else if (this.fluid.getFluid().getStillIcon() != null) { fluidIcon = this.fluid.getFluid().getStillIcon(); - } - else - { + } else { return; } @@ -324,13 +245,12 @@ else if (this.fluid.getFluid().getStillIcon() != null) GL11.glColor3ub((byte) (color >> 16 & 0xFF), (byte) (color >> 8 & 0xFF), (byte) (color & 0xFF)); GL11.glDisable(GL11.GL_BLEND); - int amount = Math.max(Math.min(this.position.height, this.fluid.amount * this.position.height / this.capacity), 1); + int amount = Math.max( + Math.min(this.position.height, this.fluid.amount * this.position.height / this.capacity), 1); int posY = this.position.y + this.position.height - amount; - for (int i = 0; i < this.position.width; i += 16) - { - for (int j = 0; j < amount; j += 16) - { + for (int i = 0; i < this.position.width; i += 16) { + for (int j = 0; j < amount; j += 16) { int drawWidth = Math.min(this.position.width - i, 16); int drawHeight = Math.min(amount - j, 16); @@ -344,9 +264,16 @@ else if (this.fluid.getFluid().getStillIcon() != null) Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F); - tessellator.addVertexWithUV(drawX + drawWidth, drawY + drawHeight, 0, minU + (maxU - minU) * drawWidth / 16F, minV + (maxV - minV) * drawHeight / 16F); - tessellator.addVertexWithUV(drawX + drawWidth, drawY, 0, minU + (maxU - minU) * drawWidth / 16F, minV); + tessellator.addVertexWithUV( + drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F); + tessellator.addVertexWithUV( + drawX + drawWidth, + drawY + drawHeight, + 0, + minU + (maxU - minU) * drawWidth / 16F, + minV + (maxV - minV) * drawHeight / 16F); + tessellator.addVertexWithUV( + drawX + drawWidth, drawY, 0, minU + (maxU - minU) * drawWidth / 16F, minV); tessellator.addVertexWithUV(drawX, drawY, 0, minU, minV); tessellator.draw(); } @@ -354,7 +281,5 @@ else if (this.fluid.getFluid().getStillIcon() != null) GL11.glEnable(GL11.GL_BLEND); } - } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 606b7fd7ae3..72a2a63b908 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -1,57 +1,47 @@ package tconstruct.plugins.nei; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import tconstruct.library.crafting.CastingRecipe; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase -{ +public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { public static final Rectangle MOLTEN_FLOW = new Rectangle(60, 8, 6, 11); public static final Rectangle MOLTEN_FLOW_NO_ITEM = new Rectangle(60, 8, 6, 27); - public class CachedCastingRecipe extends CachedBaseRecipe - { + public class CachedCastingRecipe extends CachedBaseRecipe { private List resources; private FluidTankElement metal; private PositionedStack output = null; - public CachedCastingRecipe(CastingRecipe recipe) - { + public CachedCastingRecipe(CastingRecipe recipe) { this.metal = new FluidTankElement(MOLTEN_FLOW, recipe.castingMetal.amount, recipe.castingMetal); this.metal.flowingTexture = true; this.resources = new ArrayList(); - if (recipe.cast != null) - { + if (recipe.cast != null) { this.resources.add(new PositionedStack(recipe.cast, 55, 19)); - } - else - { + } else { this.metal.position = MOLTEN_FLOW_NO_ITEM; } this.output = new PositionedStack(recipe.output, 110, 18); } @Override - public List getIngredients () - { + public List getIngredients() { return getCycledIngredients(cycleticks / 20, this.resources); } @Override - public PositionedStack getResult () - { + public PositionedStack getResult() { return this.output; } @Override - public List getFluidTanks () - { + public List getFluidTanks() { List res = new ArrayList(); res.add(this.metal); return res; @@ -59,60 +49,47 @@ public List getFluidTanks () } @Override - public String getRecipeID () - { + public String getRecipeID() { return "tconstruct.smeltery.casting"; } @Override - public String getGuiTexture () - { + public String getGuiTexture() { return "tinker:textures/gui/nei/casting.png"; } @Override - public void loadTransferRects () - { - this.transferRects.add(new RecipeTransferRect(new Rectangle(76, 18, 22, 15), this.getRecipeID(), new Object[0])); + public void loadTransferRects() { + this.transferRects.add( + new RecipeTransferRect(new Rectangle(76, 18, 22, 15), this.getRecipeID(), new Object[0])); } - public abstract List getCastingRecipes (); + public abstract List getCastingRecipes(); @Override - public void loadCraftingRecipes (String outputId, Object... results) - { - if (outputId.equals(this.getRecipeID())) - { - for (CastingRecipe recipe : this.getCastingRecipes()) - { + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(this.getRecipeID())) { + for (CastingRecipe recipe : this.getCastingRecipes()) { this.arecipes.add(new CachedCastingRecipe(recipe)); } - } - else - { + } else { super.loadCraftingRecipes(outputId, results); } } @Override - public void loadCraftingRecipes (ItemStack result) - { - for (CastingRecipe recipe : getCastingRecipes()) - { - if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) - { + public void loadCraftingRecipes(ItemStack result) { + for (CastingRecipe recipe : getCastingRecipes()) { + if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) { this.arecipes.add(new CachedCastingRecipe(recipe)); } } } @Override - public void loadUsageRecipes (ItemStack ingred) - { - for (CastingRecipe recipe : getCastingRecipes()) - { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.cast, ingred)) - { + public void loadUsageRecipes(ItemStack ingred) { + for (CastingRecipe recipe : getCastingRecipes()) { + if (NEIServerUtils.areStacksSameTypeCrafting(recipe.cast, ingred)) { CachedCastingRecipe irecipe = new CachedCastingRecipe(recipe); irecipe.setIngredientPermutation(irecipe.resources, ingred); this.arecipes.add(irecipe); @@ -121,15 +98,11 @@ public void loadUsageRecipes (ItemStack ingred) } @Override - public void loadUsageRecipes (FluidStack ingredient) - { - for (CastingRecipe recipe : getCastingRecipes()) - { - if (areFluidsEqual(recipe.castingMetal, ingredient)) - { + public void loadUsageRecipes(FluidStack ingredient) { + for (CastingRecipe recipe : getCastingRecipes()) { + if (areFluidsEqual(recipe.castingMetal, ingredient)) { this.arecipes.add(new CachedCastingRecipe(recipe)); } } } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java index f87353fef33..d984780573a 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java @@ -1,43 +1,34 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; import java.util.ArrayList; import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.util.StatCollector; - +import org.lwjgl.opengl.GL11; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; -import codechicken.lib.gui.GuiDraw; -public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase -{ +public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase { @Override - public String getRecipeName () - { + public String getRecipeName() { return StatCollector.translateToLocal("tconstruct.nei.castingbasin"); } @Override - public void drawBackground (int recipe) - { + public void drawBackground(int recipe) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(this.getGuiTexture()); GuiDraw.drawTexturedModalRect(30, 0, 0, 62, 112, 55); } @Override - public List getCastingRecipes () - { + public List getCastingRecipes() { LiquidCasting casting = TConstructRegistry.getBasinCasting(); - if (casting == null) - { + if (casting == null) { return new ArrayList(); } return casting.getCastingRecipes(); } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java index ed4cedbf8da..b9b58927b20 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java @@ -1,43 +1,34 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; import java.util.ArrayList; import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.util.StatCollector; - +import org.lwjgl.opengl.GL11; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; -import codechicken.lib.gui.GuiDraw; -public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase -{ +public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase { @Override - public String getRecipeName () - { + public String getRecipeName() { return StatCollector.translateToLocal("tconstruct.nei.castingtable"); } @Override - public void drawBackground (int recipe) - { + public void drawBackground(int recipe) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(this.getGuiTexture()); GuiDraw.drawTexturedModalRect(30, 0, 0, 0, 112, 55); } @Override - public List getCastingRecipes () - { + public List getCastingRecipes() { LiquidCasting casting = TConstructRegistry.getTableCasting(); - if (casting == null) - { + if (casting == null) { return new ArrayList(); } return casting.getCastingRecipes(); } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java index e00313ea0e5..cf15f1b8a1c 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java @@ -1,128 +1,101 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; import java.awt.Rectangle; - import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import net.minecraft.util.StatCollector; - +import org.lwjgl.opengl.GL11; import tconstruct.library.crafting.DryingRackRecipes; import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -public class RecipeHandlerDryingRack extends RecipeHandlerBase -{ +public class RecipeHandlerDryingRack extends RecipeHandlerBase { - public class CachedDryingRackRecipe extends CachedBaseRecipe - { + public class CachedDryingRackRecipe extends CachedBaseRecipe { public PositionedStack input; public PositionedStack output; public int time; - public CachedDryingRackRecipe(DryingRecipe drying) - { + public CachedDryingRackRecipe(DryingRecipe drying) { this.input = new PositionedStack(drying.input, 44, 18); this.output = new PositionedStack(drying.result, 98, 18); this.time = drying.time; } @Override - public PositionedStack getIngredient () - { + public PositionedStack getIngredient() { return this.input; } @Override - public PositionedStack getResult () - { + public PositionedStack getResult() { return this.output; } - } @Override - public String getRecipeName () - { + public String getRecipeName() { return StatCollector.translateToLocal("tconstruct.nei.dryingrack"); } @Override - public String getRecipeID () - { + public String getRecipeID() { return "tconstruct.dryingrack"; } @Override - public void loadTransferRects () - { - this.transferRects.add(new RecipeTransferRect(new Rectangle(68, 20, 22, 15), this.getRecipeID(), new Object[0])); + public void loadTransferRects() { + this.transferRects.add( + new RecipeTransferRect(new Rectangle(68, 20, 22, 15), this.getRecipeID(), new Object[0])); } @Override - public String getGuiTexture () - { + public String getGuiTexture() { return "tinker:textures/gui/nei/dryingrack.png"; } @Override - public void drawBackground (int recipe) - { + public void drawBackground(int recipe) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(this.getGuiTexture()); GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 160, 65); } @Override - public void drawExtras (int recipe) - { + public void drawExtras(int recipe) { int time = ((CachedDryingRackRecipe) this.arecipes.get(recipe)).time; int seconds = time / 20; GuiDraw.drawStringC(time + " ticks (" + seconds + " secs)", 81, 40, 0x808080, false); } @Override - public void loadCraftingRecipes (String outputId, Object... results) - { - if (outputId.equals(this.getRecipeID())) - { - for (DryingRecipe drying : DryingRackRecipes.recipes) - { + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(this.getRecipeID())) { + for (DryingRecipe drying : DryingRackRecipes.recipes) { this.arecipes.add(new CachedDryingRackRecipe(drying)); } - } - else - { + } else { super.loadCraftingRecipes(outputId, results); } } @Override - public void loadCraftingRecipes (ItemStack result) - { - for (DryingRecipe drying : DryingRackRecipes.recipes) - { - if (NEIServerUtils.areStacksSameTypeCrafting(drying.result, result)) - { + public void loadCraftingRecipes(ItemStack result) { + for (DryingRecipe drying : DryingRackRecipes.recipes) { + if (NEIServerUtils.areStacksSameTypeCrafting(drying.result, result)) { this.arecipes.add(new CachedDryingRackRecipe(drying)); } } } @Override - public void loadUsageRecipes (ItemStack ingred) - { - for (DryingRecipe drying : DryingRackRecipes.recipes) - { - if (NEIServerUtils.areStacksSameTypeCrafting(drying.input, ingred)) - { + public void loadUsageRecipes(ItemStack ingred) { + for (DryingRecipe drying : DryingRackRecipes.recipes) { + if (NEIServerUtils.areStacksSameTypeCrafting(drying.input, ingred)) { this.arecipes.add(new CachedDryingRackRecipe(drying)); } } } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index 15d70272c87..5411c0bb24c 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -1,36 +1,29 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; - import mantle.utils.ItemMetaWrapper; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.opengl.GL11; - -import net.minecraft.util.StatCollector; - import tconstruct.library.crafting.Smeltery; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -public class RecipeHandlerMelting extends RecipeHandlerBase -{ +public class RecipeHandlerMelting extends RecipeHandlerBase { public static final Rectangle MOLTEN_TANK = new Rectangle(115, 20, 18, 18); - public class CachedMeltingRecipe extends CachedBaseRecipe - { + public class CachedMeltingRecipe extends CachedBaseRecipe { private PositionedStack input; private int temperature; private FluidTankElement output; - public CachedMeltingRecipe(ItemStack input) - { + public CachedMeltingRecipe(ItemStack input) { this.input = new PositionedStack(input, 28, 21); this.temperature = Smeltery.getLiquifyTemperature(input); this.output = new FluidTankElement(MOLTEN_TANK, 1, Smeltery.getSmelteryResult(input)); @@ -38,20 +31,17 @@ public CachedMeltingRecipe(ItemStack input) } @Override - public PositionedStack getIngredient () - { + public PositionedStack getIngredient() { return this.input; } @Override - public PositionedStack getResult () - { + public PositionedStack getResult() { return null; } @Override - public List getFluidTanks () - { + public List getFluidTanks() { List tanks = new ArrayList(); tanks.add(this.output); return tanks; @@ -59,82 +49,66 @@ public List getFluidTanks () } @Override - public String getRecipeName () - { + public String getRecipeName() { return StatCollector.translateToLocal("tconstruct.nei.melting"); } @Override - public String getRecipeID () - { + public String getRecipeID() { return "tconstruct.smeltery.melting"; } @Override - public String getGuiTexture () - { + public String getGuiTexture() { return "tinker:textures/gui/nei/smeltery.png"; } @Override - public void loadTransferRects () - { - this.transferRects.add(new RecipeTransferRect(new Rectangle(72, 20, 16, 34), this.getRecipeID(), new Object[0])); + public void loadTransferRects() { + this.transferRects.add( + new RecipeTransferRect(new Rectangle(72, 20, 16, 34), this.getRecipeID(), new Object[0])); } @Override - public void drawBackground (int recipe) - { + public void drawBackground(int recipe) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(this.getGuiTexture()); GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 160, 55); } @Override - public void drawExtras (int recipe) - { + public void drawExtras(int recipe) { int temperature = ((CachedMeltingRecipe) this.arecipes.get(recipe)).temperature; GuiDraw.drawStringC(temperature + " C", 81, 9, 0x808080, false); } @Override - public void loadCraftingRecipes (String outputId, Object... results) - { - if (outputId.equals(getRecipeID())) - { - for (ItemMetaWrapper key : Smeltery.getSmeltingList().keySet()) - { + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(getRecipeID())) { + for (ItemMetaWrapper key : Smeltery.getSmeltingList().keySet()) { this.arecipes.add(new CachedMeltingRecipe(new ItemStack(key.item, 1, key.meta))); } - } - else - { + } else { super.loadCraftingRecipes(outputId, results); } } @Override - public void loadCraftingRecipes (FluidStack result) - { - for (Entry pair : Smeltery.getSmeltingList().entrySet()) - { - if (areFluidsEqual(pair.getValue(), result)) - { + public void loadCraftingRecipes(FluidStack result) { + for (Entry pair : + Smeltery.getSmeltingList().entrySet()) { + if (areFluidsEqual(pair.getValue(), result)) { this.arecipes.add(new CachedMeltingRecipe(new ItemStack(pair.getKey().item, 1, pair.getKey().meta))); } } } @Override - public void loadUsageRecipes (ItemStack ingred) - { - for (ItemMetaWrapper key : Smeltery.getSmeltingList().keySet()) - { - if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(key.item, 1, key.meta), ingred)) - { + public void loadUsageRecipes(ItemStack ingred) { + for (ItemMetaWrapper key : Smeltery.getSmeltingList().keySet()) { + if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(key.item, 1, key.meta), ingred)) { this.arecipes.add(new CachedMeltingRecipe(new ItemStack(key.item, 1, key.meta))); } } } - } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index cc4ad890e76..9091c00306c 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -1,15 +1,14 @@ package tconstruct.plugins.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; - import org.lwjgl.opengl.GL11; - import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.PatternBuilder; @@ -23,35 +22,27 @@ import tconstruct.library.util.IToolPart; import tconstruct.tools.items.ToolPart; import tconstruct.util.config.PHConstruct; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -public class RecipeHandlerToolMaterials extends RecipeHandlerBase -{ +public class RecipeHandlerToolMaterials extends RecipeHandlerBase { - public class CachedToolMaterialsRecipe extends CachedBaseRecipe - { + public class CachedToolMaterialsRecipe extends CachedBaseRecipe { public List toolParts; public ToolMaterial material; public BowMaterial bowMaterial; public ArrowMaterial arrowMaterial; - public CachedToolMaterialsRecipe(List toolParts, int materialID) - { + public CachedToolMaterialsRecipe(List toolParts, int materialID) { this.toolParts = new ArrayList(); - for (ItemStack stack : toolParts) - { + for (ItemStack stack : toolParts) { this.toolParts.add(new PositionedStack(stack, 10, 10)); } this.material = TConstructRegistry.getMaterial(materialID); } - public CachedToolMaterialsRecipe(List toolParts, int materialID, boolean arrowBow) - { + public CachedToolMaterialsRecipe(List toolParts, int materialID, boolean arrowBow) { this.toolParts = new ArrayList(); - for (ItemStack stack : toolParts) - { + for (ItemStack stack : toolParts) { this.toolParts.add(new PositionedStack(stack, 10, 10)); } this.arrowMaterial = TConstructRegistry.getArrowMaterial(materialID); @@ -59,239 +50,265 @@ public CachedToolMaterialsRecipe(List toolParts, int materialID, bool } @Override - public PositionedStack getIngredient () - { + public PositionedStack getIngredient() { return this.toolParts.get((cycleticks / 20) % this.toolParts.size()); } @Override - public PositionedStack getResult () - { + public PositionedStack getResult() { return null; } - } @Override - public String getRecipeName () - { + public String getRecipeName() { return StatCollector.translateToLocal("tconstruct.nei.toolmaterials"); } @Override - public String getRecipeID () - { + public String getRecipeID() { return "tconstruct.tools.materials"; } @Override - public String getGuiTexture () - { + public String getGuiTexture() { return "tinker:textures/gui/nei/toolmaterials.png"; } @Override - public int recipiesPerPage () - { + public int recipiesPerPage() { return 1; } @Override - public void drawBackground (int recipe) - { + public void drawBackground(int recipe) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(this.getGuiTexture()); GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 160, 130); } @Override - public void loadTransferRects () - { - this.transferRects.add(new RecipeTransferRect(new Rectangle(10, 30, 16, 16), this.getRecipeID(), new Object[0])); + public void loadTransferRects() { + this.transferRects.add( + new RecipeTransferRect(new Rectangle(10, 30, 16, 16), this.getRecipeID(), new Object[0])); } @Override - public void drawExtras (int recipe) - { + public void drawExtras(int recipe) { CachedToolMaterialsRecipe crecipe = (CachedToolMaterialsRecipe) this.arecipes.get(recipe); - if (crecipe.material != null) - { + if (crecipe.material != null) { GuiDraw.drawString(EnumChatFormatting.BOLD + crecipe.material.localizedName(), 35, 10, 0x404040, false); - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter4") + crecipe.material.durability, 35, 20, 0x404040, false); - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter5") + crecipe.material.handleModifier + "x", 35, 30, 0x404040, false); - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter11") + Math.round(crecipe.material.durability * crecipe.material.handleModifier), 35, 40, 0x404040, false); - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter6") + crecipe.material.miningspeed / 100F, 35, 50, 0x404040, false); - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter7") + HarvestLevels.getHarvestLevelName(crecipe.material.harvestLevel), 35, 60, 0x404040, false); - String heart = crecipe.material.attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (crecipe.material.attack() % 2 == 0) - { - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter10") + crecipe.material.attack / 2 + heart, 35, 70, 0x404040, false); - } - else - { - GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter10") + crecipe.material.attack / 2F + heart, 35, 70, 0x404040, false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter4") + crecipe.material.durability, + 35, + 20, + 0x404040, + false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter5") + crecipe.material.handleModifier + "x", + 35, + 30, + 0x404040, + false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter11") + + Math.round(crecipe.material.durability * crecipe.material.handleModifier), + 35, + 40, + 0x404040, + false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter6") + crecipe.material.miningspeed / 100F, + 35, + 50, + 0x404040, + false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter7") + + HarvestLevels.getHarvestLevelName(crecipe.material.harvestLevel), + 35, + 60, + 0x404040, + false); + String heart = crecipe.material.attack == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); + if (crecipe.material.attack() % 2 == 0) { + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + crecipe.material.attack / 2 + heart, + 35, + 70, + 0x404040, + false); + } else { + GuiDraw.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + crecipe.material.attack / 2F + heart, + 35, + 70, + 0x404040, + false); } int abilityY = 85; - if (crecipe.material.reinforced > 0) - { + if (crecipe.material.reinforced > 0) { GuiDraw.drawString(getReinforcedString(crecipe.material.reinforced), 35, 85, 0x404040, false); abilityY += 10; } String ability = crecipe.material.ability(); - if (ability != null) - { - if (crecipe.material.stonebound != 0) - { - GuiDraw.drawString(ability + " (" + Math.abs(crecipe.material.stonebound) + ")", 35, abilityY, 0x404040, false); - } - else - { + if (ability != null) { + if (crecipe.material.stonebound != 0) { + GuiDraw.drawString( + ability + " (" + Math.abs(crecipe.material.stonebound) + ")", + 35, + abilityY, + 0x404040, + false); + } else { GuiDraw.drawString(ability, 35, abilityY, 0x404040, false); } } } - if (crecipe.bowMaterial != null) - { + if (crecipe.bowMaterial != null) { int y = 20; int x = 35; - GuiDraw.drawString(EnumChatFormatting.BOLD + StatCollector.translateToLocal("tconstruct.nei.projectilematerials"), 35, 10, 0x404040, false); - GuiDraw.drawString(StatCollector.translateToLocal("gui.toolstation6") + crecipe.bowMaterial.drawspeed, x, y, 0x404040, false); + GuiDraw.drawString( + EnumChatFormatting.BOLD + StatCollector.translateToLocal("tconstruct.nei.projectilematerials"), + 35, + 10, + 0x404040, + false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.toolstation6") + crecipe.bowMaterial.drawspeed, + x, + y, + 0x404040, + false); y += 10; - GuiDraw.drawString(StatCollector.translateToLocal("gui.toolstation7") + crecipe.bowMaterial.flightSpeedMax, x, y, 0x404040, false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.toolstation7") + crecipe.bowMaterial.flightSpeedMax, + x, + y, + 0x404040, + false); } - if (crecipe.arrowMaterial != null) - { + if (crecipe.arrowMaterial != null) { int y = 50; int x = 35; - GuiDraw.drawString(StatCollector.translateToLocal("gui.toolstation8") + crecipe.arrowMaterial.mass, x, y, 0x404040, false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.toolstation8") + crecipe.arrowMaterial.mass, + x, + y, + 0x404040, + false); y += 10; - GuiDraw.drawString(StatCollector.translateToLocal("gui.toolstation22") + crecipe.arrowMaterial.breakChance, x, y, 0x404040, false); + GuiDraw.drawString( + StatCollector.translateToLocal("gui.toolstation22") + crecipe.arrowMaterial.breakChance, + x, + y, + 0x404040, + false); } } @Override - public void loadCraftingRecipes (String outputId, Object... results) - { - if (outputId.equals(this.getRecipeID())) - { + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(this.getRecipeID())) { ToolMaterial mat; - for (int matID : TConstructRegistry.toolMaterials.keySet()) - { + for (int matID : TConstructRegistry.toolMaterials.keySet()) { List toolParts = new ArrayList(); mat = TConstructRegistry.toolMaterials.get(matID); - for (ItemKey key : PatternBuilder.instance.materials) - { + for (ItemKey key : PatternBuilder.instance.materials) { MaterialSet set = PatternBuilder.instance.materialSets.get(key.key); - if (set.materialID == matID) - { + if (set.materialID == matID) { ItemStack stack = new ItemStack(key.item, 1, key.damage); toolParts.add(stack); } } - for (List list : TConstructRegistry.patternPartMapping.keySet()) - { - if ((Integer) list.get(2) == matID) - { + for (List list : TConstructRegistry.patternPartMapping.keySet()) { + if ((Integer) list.get(2) == matID) { toolParts.add(TConstructRegistry.patternPartMapping.get(list)); } } - if (!PHConstruct.craftMetalTools) - { - for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) - { + if (!PHConstruct.craftMetalTools) { + for (CastingRecipe recipe : + TConstructRegistry.getTableCasting().getCastingRecipes()) { ItemStack castResult = recipe.getResult(); - if (castResult.getItem() instanceof IToolPart) - { - if (((IToolPart) castResult.getItem()).getMaterialID(castResult) == matID) - { + if (castResult.getItem() instanceof IToolPart) { + if (((IToolPart) castResult.getItem()).getMaterialID(castResult) == matID) { toolParts.add(castResult); } } } } - if(toolParts.size() > 0) { + if (toolParts.size() > 0) { this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, matID)); this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, matID, true)); } } - } - else - { + } else { super.loadCraftingRecipes(outputId, results); } } @Override - public void loadUsageRecipes (ItemStack ingred) - { - if (ingred.getItem() instanceof ToolPart || ingred.getItem() instanceof DynamicToolPart) - { + public void loadUsageRecipes(ItemStack ingred) { + if (ingred.getItem() instanceof ToolPart || ingred.getItem() instanceof DynamicToolPart) { int materialID = ((IToolPart) ingred.getItem()).getMaterialID(ingred); - if (materialID >= 0) - { + if (materialID >= 0) { List toolParts = getSingleList(ingred); - if(toolParts.size() > 0) { + if (toolParts.size() > 0) { this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, materialID)); this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, materialID, true)); } } - } - else if (PatternBuilder.instance.getPartID(ingred) < Short.MAX_VALUE) - { + } else if (PatternBuilder.instance.getPartID(ingred) < Short.MAX_VALUE) { int materialID = PatternBuilder.instance.getPartID(ingred); List toolParts = getSingleList(ingred); - if(toolParts.size() > 0) { + if (toolParts.size() > 0) { this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, materialID)); this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, materialID, true)); } - } - else - { + } else { super.loadUsageRecipes(ingred); } } - public static String getReinforcedString (int reinforced) - { - if (reinforced > 9) - return "Unbreakable"; + public static String getReinforcedString(int reinforced) { + if (reinforced > 9) return "Unbreakable"; String ret = "Reinforced "; - switch (reinforced) - { - case 1: - ret += "I"; - break; - case 2: - ret += "II"; - break; - case 3: - ret += "III"; - break; - case 4: - ret += "IV"; - break; - case 5: - ret += "V"; - break; - case 6: - ret += "VI"; - break; - case 7: - ret += "VII"; - break; - case 8: - ret += "VIII"; - break; - case 9: - ret += "IX"; - break; - default: - ret += "X"; - break; + switch (reinforced) { + case 1: + ret += "I"; + break; + case 2: + ret += "II"; + break; + case 3: + ret += "III"; + break; + case 4: + ret += "IV"; + break; + case 5: + ret += "V"; + break; + case 6: + ret += "VI"; + break; + case 7: + ret += "VII"; + break; + case 8: + ret += "VIII"; + break; + case 9: + ret += "IX"; + break; + default: + ret += "X"; + break; } return ret; } - } diff --git a/src/main/java/tconstruct/plugins/te4/TE4Helper.java b/src/main/java/tconstruct/plugins/te4/TE4Helper.java index 2263ba6cd36..b9840b82dc5 100644 --- a/src/main/java/tconstruct/plugins/te4/TE4Helper.java +++ b/src/main/java/tconstruct/plugins/te4/TE4Helper.java @@ -8,14 +8,11 @@ /** * Taken from CoFHLib */ -public class TE4Helper -{ +public class TE4Helper { - public static void addFurnaceRecipe (int energy, ItemStack input, ItemStack output) - { + public static void addFurnaceRecipe(int energy, ItemStack input, ItemStack output) { - if (input == null || output == null) - { + if (input == null || output == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -29,23 +26,21 @@ public static void addFurnaceRecipe (int energy, ItemStack input, ItemStack outp FMLInterModComms.sendMessage("ThermalExpansion", "FurnaceRecipe", toSend); } - public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput) - { + public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput) { addPulverizerRecipe(energy, input, primaryOutput, null, 0); } - public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) - { + public static void addPulverizerRecipe( + int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) { addPulverizerRecipe(energy, input, primaryOutput, secondaryOutput, 100); } - public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) - { + public static void addPulverizerRecipe( + int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { - if (input == null || primaryOutput == null || secondaryOutput == null) - { + if (input == null || primaryOutput == null || secondaryOutput == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -63,23 +58,21 @@ public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack p FMLInterModComms.sendMessage("ThermalExpansion", "PulverizerRecipe", toSend); } - public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput) - { + public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput) { addSawmillRecipe(energy, input, primaryOutput, null, 0); } - public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) - { + public static void addSawmillRecipe( + int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) { addSawmillRecipe(energy, input, primaryOutput, secondaryOutput, 100); } - public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) - { + public static void addSawmillRecipe( + int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { - if (input == null || primaryOutput == null || secondaryOutput == null) - { + if (input == null || primaryOutput == null || secondaryOutput == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -97,23 +90,31 @@ public static void addSawmillRecipe (int energy, ItemStack input, ItemStack prim FMLInterModComms.sendMessage("ThermalExpansion", "SawmillRecipe", toSend); } - public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) - { + public static void addSmelterRecipe( + int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) { addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, null, 0); } - public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput) - { + public static void addSmelterRecipe( + int energy, + ItemStack primaryInput, + ItemStack secondaryInput, + ItemStack primaryOutput, + ItemStack secondaryOutput) { addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, secondaryOutput, 100); } - public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) - { + public static void addSmelterRecipe( + int energy, + ItemStack primaryInput, + ItemStack secondaryInput, + ItemStack primaryOutput, + ItemStack secondaryOutput, + int secondaryChance) { - if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) - { + if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -141,8 +142,7 @@ public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemSta * * @param oreType */ - public static void addSmelterBlastOre (String oreType) - { + public static void addSmelterBlastOre(String oreType) { NBTTagCompound toSend = new NBTTagCompound(); @@ -151,11 +151,9 @@ public static void addSmelterBlastOre (String oreType) FMLInterModComms.sendMessage("ThermalExpansion", "SmelterBlastOreType", toSend); } - public static void addCrucibleRecipe (int energy, ItemStack input, FluidStack output) - { + public static void addCrucibleRecipe(int energy, ItemStack input, FluidStack output) { - if (input == null || output == null) - { + if (input == null || output == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -170,11 +168,10 @@ public static void addCrucibleRecipe (int energy, ItemStack input, FluidStack ou FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend); } - public static void addTransposerFill (int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) - { + public static void addTransposerFill( + int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) { - if (input == null || output == null || fluid == null) - { + if (input == null || output == null || fluid == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -192,11 +189,10 @@ public static void addTransposerFill (int energy, ItemStack input, ItemStack out FMLInterModComms.sendMessage("ThermalExpansion", "TransposerFillRecipe", toSend); } - public static void addTransposerExtract (int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) - { + public static void addTransposerExtract( + int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) { - if (input == null || output == null || fluid == null) - { + if (input == null || output == null || fluid == null) { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -215,8 +211,7 @@ public static void addTransposerExtract (int energy, ItemStack input, ItemStack FMLInterModComms.sendMessage("ThermalExpansion", "TransposerExtractRecipe", toSend); } - public static void addMagmaticFuel (String fluidName, int energy) - { + public static void addMagmaticFuel(String fluidName, int energy) { NBTTagCompound toSend = new NBTTagCompound(); @@ -226,8 +221,7 @@ public static void addMagmaticFuel (String fluidName, int energy) FMLInterModComms.sendMessage("ThermalExpansion", "MagmaticFuel", toSend); } - public static void addCompressionFuel (String fluidName, int energy) - { + public static void addCompressionFuel(String fluidName, int energy) { NBTTagCompound toSend = new NBTTagCompound(); @@ -237,8 +231,7 @@ public static void addCompressionFuel (String fluidName, int energy) FMLInterModComms.sendMessage("ThermalExpansion", "CompressionFuel", toSend); } - public static void addReactantFuel (String fluidName, int energy) - { + public static void addReactantFuel(String fluidName, int energy) { NBTTagCompound toSend = new NBTTagCompound(); @@ -248,8 +241,7 @@ public static void addReactantFuel (String fluidName, int energy) FMLInterModComms.sendMessage("ThermalExpansion", "ReactantFuel", toSend); } - public static void addCoolant (String fluidName, int energy) - { + public static void addCoolant(String fluidName, int energy) { NBTTagCompound toSend = new NBTTagCompound(); diff --git a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java index 9e4efcca306..e135f6e70dc 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java +++ b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java @@ -18,30 +18,79 @@ import tconstruct.world.TinkerWorld; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers TE4 Compatibility", description = "Tinkers Construct compatibility for Thermal Expansion", modsRequired = "ThermalExpansion", forced = true) -public class TinkerTE4 -{ +@Pulse( + id = "Tinkers TE4 Compatibility", + description = "Tinkers Construct compatibility for Thermal Expansion", + modsRequired = "ThermalExpansion", + forced = true) +public class TinkerTE4 { @Handler - public void init () - { + public void init() { TConstruct.logger.info("Thermal Expansion detected. Adding Pulverizer & Induction Smelter recipes"); ItemStack crystalCinnabar = OreDictionary.getOres("crystalCinnabar").get(0); - TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 11), new ItemStack(TinkerTools.materials, 1, 40), null, 0); - TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0); - TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0); + TE4Helper.addPulverizerRecipe( + 1000, + new ItemStack(TinkerTools.materials, 1, 11), + new ItemStack(TinkerTools.materials, 1, 40), + null, + 0); + TE4Helper.addPulverizerRecipe( + 1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0); + TE4Helper.addPulverizerRecipe( + 1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0); - TE4Helper.addPulverizerRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 1), new ItemStack(TinkerTools.materials, 2, 39), GameRegistry.findItemStack("ThermalExpansion", "dustIron", 1), 10); - TE4Helper.addSmelterRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 1), crystalCinnabar.copy(), new ItemStack(TinkerTools.materials, 3, 3), new ItemStack(Items.iron_ingot), 100); - TE4Helper.addPulverizerRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 2), new ItemStack(TinkerTools.materials, 2, 38), GameRegistry.findItemStack("ThermalExpansion", "dustGold", 1), 10); - TE4Helper.addSmelterRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 2), crystalCinnabar.copy(), new ItemStack(TinkerTools.materials, 3, 4), new ItemStack(Items.gold_ingot), 100); + TE4Helper.addPulverizerRecipe( + 12000, + new ItemStack(TinkerWorld.oreSlag, 1, 1), + new ItemStack(TinkerTools.materials, 2, 39), + GameRegistry.findItemStack("ThermalExpansion", "dustIron", 1), + 10); + TE4Helper.addSmelterRecipe( + 12000, + new ItemStack(TinkerWorld.oreSlag, 1, 1), + crystalCinnabar.copy(), + new ItemStack(TinkerTools.materials, 3, 3), + new ItemStack(Items.iron_ingot), + 100); + TE4Helper.addPulverizerRecipe( + 12000, + new ItemStack(TinkerWorld.oreSlag, 1, 2), + new ItemStack(TinkerTools.materials, 2, 38), + GameRegistry.findItemStack("ThermalExpansion", "dustGold", 1), + 10); + TE4Helper.addSmelterRecipe( + 12000, + new ItemStack(TinkerWorld.oreSlag, 1, 2), + crystalCinnabar.copy(), + new ItemStack(TinkerTools.materials, 3, 4), + new ItemStack(Items.gold_ingot), + 100); - TE4Helper.addSmelterRecipe(4000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 5), null, 0); - TE4Helper.addSmelterRecipe(4000, new ItemStack(TinkerTools.materials, 1, 9), new ItemStack(TinkerTools.materials, 3, 11), new ItemStack(TinkerTools.materials, 4, 14), null, 0); + TE4Helper.addSmelterRecipe( + 4000, + new ItemStack(TinkerTools.materials, 1, 4), + new ItemStack(TinkerTools.materials, 1, 3), + new ItemStack(TinkerTools.materials, 1, 5), + null, + 0); + TE4Helper.addSmelterRecipe( + 4000, + new ItemStack(TinkerTools.materials, 1, 9), + new ItemStack(TinkerTools.materials, 3, 11), + new ItemStack(TinkerTools.materials, 4, 14), + null, + 0); // Dust Recipes - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminum", "dustAluminum", "dustAluminum", "dustCopper")); + GameRegistry.addRecipe( + new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerTools.materials, 4, 42), + "dustAluminum", + "dustAluminum", + "dustAluminum", + "dustCopper")); } @Handler @@ -52,40 +101,47 @@ public void postInit(FMLPostInitializationEvent event) { // selected fluid transposer recipies // tesseract - ItemStack tesseractEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractEmpty" ,1); - ItemStack tesseractFull = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractFull" ,1); - TConstructRegistry.getBasinCasting().addCastingRecipe(tesseractFull, new FluidStack(enderFluid, 1000), tesseractEmpty, true, 300); + ItemStack tesseractEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractEmpty", 1); + ItemStack tesseractFull = GameRegistry.findItemStack("ThermalExpansion", "frameTesseractFull", 1); + TConstructRegistry.getBasinCasting() + .addCastingRecipe(tesseractFull, new FluidStack(enderFluid, 1000), tesseractEmpty, true, 300); // redstone energy cell ItemStack cellFrameEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameCellReinforcedEmpty", 1); ItemStack cellFrameFull = GameRegistry.findItemStack("ThermalExpansion", "frameCellReinforcedFull", 1); - TConstructRegistry.getBasinCasting().addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100); + TConstructRegistry.getBasinCasting() + .addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100); cellFrameEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameCellResonantEmpty", 1); - if(cellFrameEmpty != null) { + if (cellFrameEmpty != null) { cellFrameFull = GameRegistry.findItemStack("ThermalExpansion", "frameCellResonantFull", 1); - TConstructRegistry.getBasinCasting().addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100); + TConstructRegistry.getBasinCasting() + .addCastingRecipe(cellFrameFull, new FluidStack(redstoneFluid, 4000), cellFrameEmpty, true, 100); } // glowstone illuminator - ItemStack illuminatorEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameIlluminator" ,1); - ItemStack illuminator = GameRegistry.findItemStack("ThermalExpansion", "illuminator" ,1); - TConstructRegistry.getBasinCasting().addCastingRecipe(illuminator, new FluidStack(glowstoneFluid, 1000), illuminatorEmpty, true, 300); + ItemStack illuminatorEmpty = GameRegistry.findItemStack("ThermalExpansion", "frameIlluminator", 1); + ItemStack illuminator = GameRegistry.findItemStack("ThermalExpansion", "illuminator", 1); + TConstructRegistry.getBasinCasting() + .addCastingRecipe(illuminator, new FluidStack(glowstoneFluid, 1000), illuminatorEmpty, true, 300); // plates - ItemStack plate = GameRegistry.findItemStack("ThermalExpansion", "plateFrame" ,1); - ItemStack plateRedstone = GameRegistry.findItemStack("ThermalExpansion", "plateSignal" ,1); - ItemStack plateGlowstone = GameRegistry.findItemStack("ThermalExpansion", "plateImpulse" ,1); - ItemStack plateEnder = GameRegistry.findItemStack("ThermalExpansion", "plateTranslocate" ,1); + ItemStack plate = GameRegistry.findItemStack("ThermalExpansion", "plateFrame", 1); + ItemStack plateRedstone = GameRegistry.findItemStack("ThermalExpansion", "plateSignal", 1); + ItemStack plateGlowstone = GameRegistry.findItemStack("ThermalExpansion", "plateImpulse", 1); + ItemStack plateEnder = GameRegistry.findItemStack("ThermalExpansion", "plateTranslocate", 1); - TConstructRegistry.getTableCasting().addCastingRecipe(plateRedstone, new FluidStack(redstoneFluid, 1000), plate, true, 100); - TConstructRegistry.getTableCasting().addCastingRecipe(plateGlowstone, new FluidStack(glowstoneFluid, 1000), plate, true, 100); - TConstructRegistry.getTableCasting().addCastingRecipe(plateEnder, new FluidStack(enderFluid, 1000), plate, true, 100); + TConstructRegistry.getTableCasting() + .addCastingRecipe(plateRedstone, new FluidStack(redstoneFluid, 1000), plate, true, 100); + TConstructRegistry.getTableCasting() + .addCastingRecipe(plateGlowstone, new FluidStack(glowstoneFluid, 1000), plate, true, 100); + TConstructRegistry.getTableCasting() + .addCastingRecipe(plateEnder, new FluidStack(enderFluid, 1000), plate, true, 100); // last but not least.. a really weird hardened glass recipe - ItemStack hardenedGlass = GameRegistry.findItemStack("ThermalExpansion", "blockGlassHardened" ,1); + ItemStack hardenedGlass = GameRegistry.findItemStack("ThermalExpansion", "blockGlassHardened", 1); ItemStack obsidian = new ItemStack(Blocks.obsidian); - FluidStack lead = new FluidStack(TinkerSmeltery.moltenLeadFluid, TConstruct.ingotLiquidValue/2); + FluidStack lead = new FluidStack(TinkerSmeltery.moltenLeadFluid, TConstruct.ingotLiquidValue / 2); TConstructRegistry.getBasinCasting().addCastingRecipe(hardenedGlass, lead, obsidian, true, 150); } } diff --git a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java index 452ea9e2dff..b47f85abed4 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java +++ b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java @@ -1,31 +1,29 @@ package tconstruct.plugins.te4; import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import tconstruct.TConstruct; -import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.FluidType; -import tconstruct.library.crafting.LiquidCasting; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; -import java.util.ArrayList; - @GameRegistry.ObjectHolder(TinkersThermalFoundation.TF_MOD_ID) -@Pulse(id = "Tinkers Thermal Foundation Compatibility", description = "Tinkers Construct compatibility for Thermal Foundation", modsRequired = TinkersThermalFoundation.TF_MOD_ID, forced = true) +@Pulse( + id = "Tinkers Thermal Foundation Compatibility", + description = "Tinkers Construct compatibility for Thermal Foundation", + modsRequired = TinkersThermalFoundation.TF_MOD_ID, + forced = true) public class TinkersThermalFoundation { static final String TF_MOD_ID = "ThermalFoundation"; @@ -52,32 +50,45 @@ public void init(FMLInitializationEvent event) { Fluid glowstoneFluid = FluidRegistry.getFluid("glowstone"); Fluid coalFluid = FluidRegistry.getFluid("coal"); - //pyrotheum fuel + // pyrotheum fuel // register pyrotheum if it's present Smeltery.addSmelteryFuel(pyrotheumFluid, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb // liquid redstone - for(ItemStack stack : OreDictionary.getOres("blockRedstone")) - Smeltery.addMelting(stack, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3000, new FluidStack(redstoneFluid, 900)); - for(ItemStack stack : OreDictionary.getOres("dustRedstone")) - Smeltery.addMelting(stack, Blocks.redstone_block, stack.getItemDamage(), 2500, new FluidStack(redstoneFluid, 100)); + for (ItemStack stack : OreDictionary.getOres("blockRedstone")) + Smeltery.addMelting( + stack, + Block.getBlockFromItem(stack.getItem()), + stack.getItemDamage(), + 3000, + new FluidStack(redstoneFluid, 900)); + for (ItemStack stack : OreDictionary.getOres("dustRedstone")) + Smeltery.addMelting( + stack, Blocks.redstone_block, stack.getItemDamage(), 2500, new FluidStack(redstoneFluid, 100)); // liquid glowstone - for(ItemStack stack : OreDictionary.getOres("glowstone")) - Smeltery.addMelting(stack, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3000, new FluidStack(glowstoneFluid, 1000)); - for(ItemStack stack : OreDictionary.getOres("dustGlowstone")) - Smeltery.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250)); + for (ItemStack stack : OreDictionary.getOres("glowstone")) + Smeltery.addMelting( + stack, + Block.getBlockFromItem(stack.getItem()), + stack.getItemDamage(), + 3000, + new FluidStack(glowstoneFluid, 1000)); + for (ItemStack stack : OreDictionary.getOres("dustGlowstone")) + Smeltery.addMelting( + stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250)); // liquid pyrotheum - for(ItemStack stack : OreDictionary.getOres("dustPyrotheum")) - Smeltery.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 1299, new FluidStack(pyrotheumFluid, 100)); + for (ItemStack stack : OreDictionary.getOres("dustPyrotheum")) + Smeltery.addMelting( + stack, Blocks.glowstone, stack.getItemDamage(), 1299, new FluidStack(pyrotheumFluid, 100)); // liquid cryotheum - for(ItemStack stack : OreDictionary.getOres("dustCryotheum")) + for (ItemStack stack : OreDictionary.getOres("dustCryotheum")) Smeltery.addMelting(stack, Blocks.snow, stack.getItemDamage(), 4000, new FluidStack(cryotheumFluid, 100)); // liquid coal - for(ItemStack stack : OreDictionary.getOres("dustCoal")) + for (ItemStack stack : OreDictionary.getOres("dustCoal")) Smeltery.addMelting(stack, Blocks.coal_block, stack.getItemDamage(), 4000, new FluidStack(coalFluid, 100)); // Alloying @@ -118,12 +129,11 @@ public void init(FMLInitializationEvent event) { Smeltery.addAlloyMixing(result, part1, part2, part3, new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000)); } - private void registerFluidType(String name, int temp, Fluid fluid) { ItemStack stack = GameRegistry.findItemStack(TF_MOD_ID, "block" + name, 1); - if(stack == null || stack.getItem() == null) - stack = new ItemStack(TinkerWorld.metalBlock); + if (stack == null || stack.getItem() == null) stack = new ItemStack(TinkerWorld.metalBlock); - FluidType.registerFluidType(name, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), temp, fluid, false); + FluidType.registerFluidType( + name, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), temp, fluid, false); } } diff --git a/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java b/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java index 0067e0a40c0..656834d62cc 100644 --- a/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java +++ b/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java @@ -1,7 +1,6 @@ package tconstruct.plugins.ubc; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import exterminatorJeff.undergroundBiomes.api.UBAPIHook; import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer.BlocksAreAlreadySet; import mantle.pulsar.pulse.Handler; @@ -9,34 +8,33 @@ import tconstruct.TConstruct; import tconstruct.world.TinkerWorld; -@Pulse(id = "Tinkers' Underground Biomes Compatiblity", description = "Tinkers' Construct compatibilty for Underground Biomes Construct", modsRequired = "UndergroundBiomes", pulsesRequired = "Tinkers' World", forced = true) -public class TinkerUBC -{ +@Pulse( + id = "Tinkers' Underground Biomes Compatiblity", + description = "Tinkers' Construct compatibilty for Underground Biomes Construct", + modsRequired = "UndergroundBiomes", + pulsesRequired = "Tinkers' World", + forced = true) +public class TinkerUBC { @Handler - public void preInit (FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { registerBlock(3, "Copper"); registerBlock(4, "Tin"); registerBlock(5, "Aluminum"); } - private void registerBlock (int meta, String blockName) - { + private void registerBlock(int meta, String blockName) { String overlayTexture = blockName.toLowerCase(); - try - { - UBAPIHook.ubAPIHook.ubOreTexturizer.requestUBOreSetup(TinkerWorld.oreSlag, meta, "tinker:ore_" + overlayTexture + "_overlay", "MetalOre." + blockName); - } - catch (RuntimeException exception) - { + try { + UBAPIHook.ubAPIHook.ubOreTexturizer.requestUBOreSetup( + TinkerWorld.oreSlag, meta, "tinker:ore_" + overlayTexture + "_overlay", "MetalOre." + blockName); + } catch (RuntimeException exception) { // we have to work around this because otherwise FML would access this for some reason // and crash because BlocksAreAlreadySet Exception is not present without UBC - if(exception instanceof BlocksAreAlreadySet) + if (exception instanceof BlocksAreAlreadySet) TConstruct.logger.error(blockName + " is already registered in UBC"); else // rethrow if it's another exception throw exception; } - } } diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index e6454c175b7..b05f79638bb 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -1,5 +1,6 @@ package tconstruct.plugins.waila; +import java.util.List; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -13,49 +14,40 @@ import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.CastingBasinLogic; -import java.util.List; - -public class BasinDataProvider implements IWailaDataProvider -{ +public class BasinDataProvider implements IWailaDataProvider { @Override - public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof CastingBasinLogic) - { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof CastingBasinLogic) { return ((CastingBasinLogic) accessor.getTileEntity()).getStackInSlot(0); } return null; } @Override - public List getWailaHead (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof CastingBasinLogic && config.getConfig("tcon.basin", true)) - { + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof CastingBasinLogic && config.getConfig("tcon.basin", true)) { CastingBasinLogic te = (CastingBasinLogic) accessor.getTileEntity(); - if (te.getFluidAmount() != 0) - { + if (te.getFluidAmount() != 0) { FluidStack fs = te.getFluid(); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + te.getCapacity()); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + + te.getCapacity()); final int progress = te.getProgress(); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.progress") + progress + "%"); - } - else - { - if (te.getStackInSlot(0) != null) - { - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") + te.getStackInSlot(0).getDisplayName()); - } - else - { + } else { + if (te.getStackInSlot(0) != null) { + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") + + te.getStackInSlot(0).getDisplayName()); + } else { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } } @@ -64,13 +56,14 @@ public List getWailaBody (ItemStack itemStack, List currenttip, } @Override - public List getWailaTail (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index db1b8442d3a..dfa679606ae 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -12,26 +12,23 @@ import net.minecraftforge.fluids.*; import tconstruct.smeltery.logic.CastingChannelLogic; -public class CastingChannelDataProvider implements IWailaDataProvider -{ +public class CastingChannelDataProvider implements IWailaDataProvider { @Override - public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; } @Override - public List getWailaHead (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof CastingChannelLogic) - { + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof CastingChannelLogic) { CastingChannelLogic te = (CastingChannelLogic) accessor.getTileEntity(); FluidTankInfo internalTank = te.getTankInfo(null)[0]; FluidTankInfo northTank = te.getTankInfo(ForgeDirection.NORTH)[0]; @@ -39,14 +36,13 @@ public List getWailaBody (ItemStack itemStack, List currenttip, FluidTankInfo westTank = te.getTankInfo(ForgeDirection.WEST)[0]; FluidTankInfo eastTank = te.getTankInfo(ForgeDirection.EAST)[0]; - if (internalTank.fluid != null && internalTank.fluid.amount > 0) - { + if (internalTank.fluid != null && internalTank.fluid.amount > 0) { FluidStack fs = internalTank.fluid; - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + internalTank.capacity); - } - else - { + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + + internalTank.capacity); + } else { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } @@ -54,14 +50,10 @@ public List getWailaBody (ItemStack itemStack, List currenttip, String s1, s2, s3, s4; s1 = s2 = s3 = s4 = StatCollector.translateToLocal("tconstruct.waila.empty"); - if (northTank.fluid != null) - s1 = northTank.fluid.amount + " / " + northTank.capacity; - if (southTank.fluid != null) - s2 = southTank.fluid.amount + " / " + southTank.capacity; - if (westTank.fluid != null) - s3 = westTank.fluid.amount + " / " + westTank.capacity; - if (eastTank.fluid != null) - s4 = eastTank.fluid.amount + " / " + eastTank.capacity; + if (northTank.fluid != null) s1 = northTank.fluid.amount + " / " + northTank.capacity; + if (southTank.fluid != null) s2 = southTank.fluid.amount + " / " + southTank.capacity; + if (westTank.fluid != null) s3 = westTank.fluid.amount + " / " + westTank.capacity; + if (eastTank.fluid != null) s4 = eastTank.fluid.amount + " / " + eastTank.capacity; currenttip.add(s1 + "; " + s2 + "; " + s3 + "; " + s4); } @@ -69,13 +61,14 @@ public List getWailaBody (ItemStack itemStack, List currenttip, } @Override - public List getWailaTail (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index b2e877186d6..907cb6fde40 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -11,35 +11,31 @@ import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.LavaTankLogic; -public class SearedTankDataProvider implements IWailaDataProvider -{ +public class SearedTankDataProvider implements IWailaDataProvider { @Override - public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; } @Override - public List getWailaHead (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof LavaTankLogic && config.getConfig("tcon.searedtank", true)) - { + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof LavaTankLogic && config.getConfig("tcon.searedtank", true)) { LavaTankLogic te = (LavaTankLogic) accessor.getTileEntity(); - if (te.containsFluid()) - { + if (te.containsFluid()) { FluidStack fs = te.tank.getFluid(); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + te.tank.getCapacity()); - } - else - { + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + + te.tank.getCapacity()); + } else { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } } @@ -47,13 +43,14 @@ public List getWailaBody (ItemStack itemStack, List currenttip, } @Override - public List getWailaTail (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index 4b81438ab2a..ce25f5ae4f6 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -11,46 +11,37 @@ import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.SmelteryLogic; -public class SmelteryDataProvider implements IWailaDataProvider -{ +public class SmelteryDataProvider implements IWailaDataProvider { @Override - public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { return null; } @Override - public List getWailaHead (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof SmelteryLogic && config.getConfig("tcon.smeltery", true)) - { + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof SmelteryLogic && config.getConfig("tcon.smeltery", true)) { SmelteryLogic te = (SmelteryLogic) accessor.getTileEntity(); - if (te.validStructure) - { + if (te.validStructure) { List fls = te.moltenMetal; - if (fls.size() <= 0) - { + if (fls.size() <= 0) { currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); - } - else - { - for (int i = 0; i < fls.size(); i++) - { + } else { + for (int i = 0; i < fls.size(); i++) { FluidStack st = fls.get(i); currenttip.add(WailaRegistrar.fluidNameHelper(st) + " (" + st.amount + "mB)"); } } - } - else - { - currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.invalidstructure")); + } else { + currenttip.add( + SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.invalidstructure")); } } @@ -58,13 +49,14 @@ public List getWailaBody (ItemStack itemStack, List currenttip, } @Override - public List getWailaTail (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index 33b5fcfffb9..9046c27b399 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -1,5 +1,6 @@ package tconstruct.plugins.waila; +import java.util.List; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -11,16 +12,11 @@ import net.minecraft.world.World; import tconstruct.smeltery.logic.CastingTableLogic; -import java.util.List; - -public class TableDataProvider implements IWailaDataProvider -{ +public class TableDataProvider implements IWailaDataProvider { @Override - public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof CastingTableLogic) - { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof CastingTableLogic) { CastingTableLogic te = (CastingTableLogic) accessor.getTileEntity(); return te.getStackInSlot(0); } @@ -28,25 +24,25 @@ public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler } @Override - public List getWailaHead (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (accessor.getTileEntity() instanceof CastingTableLogic && config.getConfig("tcon.table", true)) - { + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (accessor.getTileEntity() instanceof CastingTableLogic && config.getConfig("tcon.table", true)) { CastingTableLogic te = (CastingTableLogic) accessor.getTileEntity(); - if (te.getStackInSlot(1) != null) - { - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") + te.getStackInSlot(1).getDisplayName()); + if (te.getStackInSlot(1) != null) { + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") + + te.getStackInSlot(1).getDisplayName()); } - if (te.getFluid() != null) - { - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(te.getFluid())); - currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + te.getFluidAmount() + "/" + te.getCapacity()); + if (te.getFluid() != null) { + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + + WailaRegistrar.fluidNameHelper(te.getFluid())); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + te.getFluidAmount() + "/" + + te.getCapacity()); final int progress = te.getProgress(); currenttip.add(StatCollector.translateToLocal("tconstruct.waila.progress") + progress + "%"); } @@ -55,13 +51,14 @@ public List getWailaBody (ItemStack itemStack, List currenttip, } @Override - public List getWailaTail (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } } diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index 5dfd6a1e3ad..2d37b56e54d 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -6,12 +6,14 @@ import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers Waila Compatibility", description = "Tinkers Construct compatibility for Waila", modsRequired = "Waila", forced = true) -public class TinkerWaila -{ +@Pulse( + id = "Tinkers Waila Compatibility", + description = "Tinkers Construct compatibility for Waila", + modsRequired = "Waila", + forced = true) +public class TinkerWaila { @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { TConstruct.logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry."); FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.WailaRegistrar.wailaCallback"); } diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java index aaff10be73f..3c0754ec55a 100644 --- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java +++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java @@ -6,10 +6,8 @@ import tconstruct.smeltery.blocks.*; import tconstruct.smeltery.logic.*; -public class WailaRegistrar -{ - public static void wailaCallback (IWailaRegistrar registrar) - { +public class WailaRegistrar { + public static void wailaCallback(IWailaRegistrar registrar) { TConstruct.logger.info("[Waila-Compat] Got registrar: " + registrar); // Configs @@ -22,7 +20,7 @@ public static void wailaCallback (IWailaRegistrar registrar) // Tanks registrar.registerBodyProvider(new SearedTankDataProvider(), LavaTankBlock.class); registrar.registerBodyProvider(new CastingChannelDataProvider(), CastingChannelLogic.class); - //registrar.registerBodyProvider(new EssenceExtractorDataProvider(), EssenceExtractor.class); + // registrar.registerBodyProvider(new EssenceExtractorDataProvider(), EssenceExtractor.class); // Casting systems registrar.registerBodyProvider(new BasinDataProvider(), CastingBasinLogic.class); @@ -32,9 +30,7 @@ public static void wailaCallback (IWailaRegistrar registrar) registrar.registerBodyProvider(new SmelteryDataProvider(), SmelteryBlock.class); } - public static String fluidNameHelper (FluidStack f) - { + public static String fluidNameHelper(FluidStack f) { return f.getFluid().getLocalizedName(); } - } diff --git a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java index 667b459e7fc..322a7cf71c2 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java @@ -4,35 +4,34 @@ import net.minecraft.util.*; import tconstruct.library.tools.AbilityHelper; -public class SmelteryDamageSource extends DamageSource -{ - public SmelteryDamageSource() - { +public class SmelteryDamageSource extends DamageSource { + public SmelteryDamageSource() { super("smeltery"); } @Override - public IChatComponent func_151519_b (EntityLivingBase par1EntityLiving) - { + public IChatComponent func_151519_b(EntityLivingBase par1EntityLiving) { String type = ""; - switch (AbilityHelper.random.nextInt(4)) - { - case 0: - type = "one."; - break; - case 1: - type = "two."; - break; - case 2: - type = "three."; - break; - case 3: - type = "four."; - break; + switch (AbilityHelper.random.nextInt(4)) { + case 0: + type = "one."; + break; + case 1: + type = "two."; + break; + case 2: + type = "three."; + break; + case 3: + type = "four."; + break; } EntityLivingBase entityliving1 = par1EntityLiving.func_94060_bK(); String s = "death." + type + this.damageType; String s1 = s + ".player"; - return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation(s1, new Object[] { par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_() }) : new ChatComponentTranslation(s, new Object[] { par1EntityLiving.func_145748_c_() }); + return entityliving1 != null && StatCollector.canTranslate(s1) + ? new ChatComponentTranslation( + s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()}) + : new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()}); } } diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java index 0169d231b8d..b4bb7be2589 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java @@ -21,13 +21,10 @@ import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.*; import tconstruct.tools.TinkerTools; -import tconstruct.util.config.PHConstruct; -public class SmelteryProxyClient extends SmelteryProxyCommon -{ +public class SmelteryProxyClient extends SmelteryProxyCommon { @Override - public void initialize () - { + public void initialize() { registerRenderer(); registerGuiHandler(); registerManualIcons(); @@ -35,8 +32,7 @@ public void initialize () MinecraftForge.EVENT_BUS.register(this); } - void registerRenderer () - { + void registerRenderer() { RenderingRegistry.registerBlockHandler(new TankRender()); RenderingRegistry.registerBlockHandler(new CastingBlockRender()); RenderingRegistry.registerBlockHandler(new DryingRackRender()); @@ -47,7 +43,8 @@ void registerRenderer () IItemRenderer tankItemRenderer = new TankItemRenderer(); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TinkerSmeltery.lavaTank), tankItemRenderer); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TinkerSmeltery.lavaTankNether), tankItemRenderer); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(TinkerSmeltery.lavaTankNether), tankItemRenderer); RenderingRegistry.registerBlockHandler(new SmelteryRender()); @@ -56,8 +53,7 @@ void registerRenderer () ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender()); } - void registerManualIcons () - { + void registerManualIcons() { MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TinkerTools.manualBook, 1, 2)); MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TinkerSmeltery.smeltery)); MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TinkerTools.blankPattern, 1, 1)); @@ -79,8 +75,7 @@ void registerManualIcons () MProxyClient.registerManualPage("blockcast", BlockCastPage.class); } - void registerManualRecipes () - { + void registerManualRecipes() { ItemStack sand = new ItemStack(Blocks.sand, 1, 0); ItemStack gravel = new ItemStack(Blocks.gravel, 1, 0); ItemStack clay = new ItemStack(Items.clay_ball, 1, 0); @@ -93,34 +88,147 @@ void registerManualRecipes () MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); MantleClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); - MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TinkerSmeltery.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TinkerSmeltery.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TinkerArmor.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); - - MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TinkerSmeltery.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - - MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TinkerSmeltery.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TinkerSmeltery.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TinkerSmeltery.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, searedbrick); - - MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TinkerSmeltery.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); - MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TinkerSmeltery.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TinkerSmeltery.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); + MantleClientRegistry.registerManualSmallRecipe( + "searedbricks", + new ItemStack(TinkerSmeltery.smeltery, 1, 2), + searedbrick, + searedbrick, + searedbrick, + searedbrick); + MantleClientRegistry.registerManualLargeRecipe( + "smelterycontroller", + new ItemStack(TinkerSmeltery.smeltery, 1, 0), + searedbrick, + searedbrick, + searedbrick, + searedbrick, + null, + searedbrick, + searedbrick, + searedbrick, + searedbrick); + MantleClientRegistry.registerManualLargeRecipe( + "dryingrack", + new ItemStack(TinkerArmor.dryingRack, 1, 0), + null, + null, + null, + plankSlab, + plankSlab, + plankSlab, + null, + null, + null); + + MantleClientRegistry.registerManualLargeRecipe( + "smelterydrain", + new ItemStack(TinkerSmeltery.smeltery, 1, 1), + searedbrick, + null, + searedbrick, + searedbrick, + null, + searedbrick, + searedbrick, + null, + searedbrick); + + MantleClientRegistry.registerManualLargeRecipe( + "smelterytank1", + new ItemStack(TinkerSmeltery.lavaTank, 1, 0), + searedbrick, + searedbrick, + searedbrick, + searedbrick, + glass, + searedbrick, + searedbrick, + searedbrick, + searedbrick); + MantleClientRegistry.registerManualLargeRecipe( + "smelterytank2", + new ItemStack(TinkerSmeltery.lavaTank, 1, 1), + searedbrick, + glass, + searedbrick, + glass, + glass, + glass, + searedbrick, + glass, + searedbrick); + MantleClientRegistry.registerManualLargeRecipe( + "smelterytank3", + new ItemStack(TinkerSmeltery.lavaTank, 1, 2), + searedbrick, + glass, + searedbrick, + searedbrick, + glass, + searedbrick, + searedbrick, + glass, + searedbrick); + + MantleClientRegistry.registerManualLargeRecipe( + "smelterytable", + new ItemStack(TinkerSmeltery.searedBlock, 1, 0), + searedbrick, + searedbrick, + searedbrick, + searedbrick, + null, + searedbrick, + searedbrick, + null, + searedbrick); + MantleClientRegistry.registerManualLargeRecipe( + "smelteryfaucet", + new ItemStack(TinkerSmeltery.searedBlock, 1, 1), + searedbrick, + null, + searedbrick, + null, + searedbrick, + null, + null, + null, + null); + MantleClientRegistry.registerManualLargeRecipe( + "castingchannel", + new ItemStack(TinkerSmeltery.castingChannel), + null, + null, + null, + searedbrick, + null, + searedbrick, + searedbrick, + searedbrick, + searedbrick); + MantleClientRegistry.registerManualLargeRecipe( + "smelterybasin", + new ItemStack(TinkerSmeltery.searedBlock, 1, 2), + searedbrick, + null, + searedbrick, + searedbrick, + null, + searedbrick, + searedbrick, + searedbrick, + searedbrick); } @Override - protected void registerGuiHandler () - { + protected void registerGuiHandler() { TProxyCommon.registerClientGuiHandler(smelteryGuiID, this); TProxyCommon.registerServerGuiHandler(smelteryGuiID, this); } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { - if (ID == SmelteryProxyCommon.smelteryGuiID) - { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + if (ID == SmelteryProxyCommon.smelteryGuiID) { return new SmelteryGui(player.inventory, (SmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z); } return null; diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java index 152ab1c2141..22ba92053b3 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java @@ -7,26 +7,21 @@ import net.minecraft.world.World; import tconstruct.common.TProxyCommon; -public class SmelteryProxyCommon implements IGuiHandler -{ +public class SmelteryProxyCommon implements IGuiHandler { public static final int smelteryGuiID = 7; - public void initialize () - { + public void initialize() { registerGuiHandler(); } - protected void registerGuiHandler () - { + protected void registerGuiHandler() { TProxyCommon.registerServerGuiHandler(smelteryGuiID, this); } @Override - public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof InventoryLogic) - { + if (tile != null && tile instanceof InventoryLogic) { return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); } @@ -34,10 +29,8 @@ public Object getServerGuiElement (int ID, EntityPlayer player, World world, int } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { // TODO Auto-generated method stub return null; } - } diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index b20288d1dce..995b2e3d2f9 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import java.util.*; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.MultiServantLogic; import mantle.pulsar.pulse.Handler; @@ -38,22 +39,21 @@ import tconstruct.library.util.IPattern; import tconstruct.smeltery.blocks.*; import tconstruct.smeltery.itemblocks.*; +import tconstruct.smeltery.items.ClayPattern; import tconstruct.smeltery.items.FilledBucket; import tconstruct.smeltery.items.MetalPattern; -import tconstruct.smeltery.items.ClayPattern; import tconstruct.smeltery.logic.*; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; import tconstruct.world.items.OreBerries; -import java.util.*; - @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Smeltery", description = "Liquid metals, casting, and the multiblock structure.") -public class TinkerSmeltery -{ - @SidedProxy(clientSide = "tconstruct.smeltery.SmelteryProxyClient", serverSide = "tconstruct.smeltery.SmelteryProxyCommon") +public class TinkerSmeltery { + @SidedProxy( + clientSide = "tconstruct.smeltery.SmelteryProxyClient", + serverSide = "tconstruct.smeltery.SmelteryProxyCommon") public static SmelteryProxyCommon proxy; public static Item metalPattern; @@ -152,8 +152,7 @@ public class TinkerSmeltery public static Block blood; @Handler - public void preInit (FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { TinkerSmelteryEvents smelteryEvents = new TinkerSmelteryEvents(); MinecraftForge.EVENT_BUS.register(smelteryEvents); FMLCommonHandler.instance().bus().register(smelteryEvents); @@ -167,14 +166,16 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.speedSlab = new SpeedSlab().setBlockName("SpeedSlab"); TinkerSmeltery.speedSlab.stepSound = Block.soundTypeStone; - TinkerSmeltery.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); + TinkerSmeltery.glueBlock = + new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); // Smeltery TinkerSmeltery.smeltery = new SmelteryBlock().setBlockName("Smeltery"); TinkerSmeltery.smelteryNether = new SmelteryBlock("nether").setBlockName("Smeltery"); TinkerSmeltery.lavaTank = new LavaTankBlock().setBlockName("LavaTank"); TinkerSmeltery.lavaTank.setStepSound(Block.soundTypeGlass); - TinkerSmeltery.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank"); + TinkerSmeltery.lavaTankNether = + new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank"); TinkerSmeltery.searedBlock = new SearedBlock().setBlockName("SearedBlock"); TinkerSmeltery.searedBlockNether = new SearedBlock("nether").setBlockName("SearedBlock"); @@ -190,7 +191,6 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.moltenGoldFluid = registerFluid("gold"); TinkerSmeltery.moltenGold = TinkerSmeltery.moltenGoldFluid.getBlock(); - TinkerSmeltery.moltenCopperFluid = registerFluid("copper"); TinkerSmeltery.moltenCopper = TinkerSmeltery.moltenCopperFluid.getBlock(); @@ -209,7 +209,15 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.moltenBronzeFluid = registerFluid("bronze"); TinkerSmeltery.moltenBronze = TinkerSmeltery.moltenBronzeFluid.getBlock(); - TinkerSmeltery.moltenAlubrassFluid = registerFluid("aluminiumbrass", "aluminumbrass.molten", "fluid.molten.alubrass", "liquid_alubrass", 3000, 6000, 1300, Material.lava); + TinkerSmeltery.moltenAlubrassFluid = registerFluid( + "aluminiumbrass", + "aluminumbrass.molten", + "fluid.molten.alubrass", + "liquid_alubrass", + 3000, + 6000, + 1300, + Material.lava); TinkerSmeltery.moltenAlubrass = TinkerSmeltery.moltenAlubrassFluid.getBlock(); TinkerSmeltery.moltenManyullynFluid = registerFluid("manyullyn"); @@ -227,13 +235,16 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.moltenGlassFluid = registerFluid("glass"); TinkerSmeltery.moltenGlass = TinkerSmeltery.moltenGlassFluid.getBlock(); - TinkerSmeltery.moltenStoneFluid = registerFluid("stone", "stone.seared", "molten.stone", "liquid_stone", 3000, 6000, 1300, Material.lava); + TinkerSmeltery.moltenStoneFluid = + registerFluid("stone", "stone.seared", "molten.stone", "liquid_stone", 3000, 6000, 1300, Material.lava); TinkerSmeltery.moltenStone = TinkerSmeltery.moltenStoneFluid.getBlock(); - TinkerSmeltery.moltenEmeraldFluid = registerFluid("emerald", "emerald.liquid", "molten.emerald", "liquid_villager", 3000, 6000, 1300, Material.lava); + TinkerSmeltery.moltenEmeraldFluid = registerFluid( + "emerald", "emerald.liquid", "molten.emerald", "liquid_villager", 3000, 6000, 1300, Material.lava); TinkerSmeltery.moltenEmerald = TinkerSmeltery.moltenEmeraldFluid.getBlock(); - TinkerSmeltery.moltenQuartzFluid = registerFluid("quartz", "quartz.molten", "molten.quartz", "liquid_quartz", 3000, 6000, 1300, Material.lava); + TinkerSmeltery.moltenQuartzFluid = registerFluid( + "quartz", "quartz.molten", "molten.quartz", "liquid_quartz", 3000, 6000, 1300, Material.lava); TinkerSmeltery.moltenQuartz = TinkerSmeltery.moltenQuartzFluid.getBlock(); TinkerSmeltery.moltenNickelFluid = registerFluid("nickel", "liquid_ferrous"); @@ -245,7 +256,8 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.moltenSilverFluid = registerFluid("silver"); TinkerSmeltery.moltenSilver = TinkerSmeltery.moltenSilverFluid.getBlock(); - TinkerSmeltery.moltenShinyFluid = registerFluid("platinum", "platinum.molten", "fluid.molten.shiny", "liquid_shiny", 3000, 6000, 1300, Material.lava); + TinkerSmeltery.moltenShinyFluid = registerFluid( + "platinum", "platinum.molten", "fluid.molten.shiny", "liquid_shiny", 3000, 6000, 1300, Material.lava); TinkerSmeltery.moltenShiny = TinkerSmeltery.moltenShinyFluid.getBlock(); TinkerSmeltery.moltenInvarFluid = registerFluid("invar"); @@ -254,7 +266,8 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.moltenElectrumFluid = registerFluid("electrum"); TinkerSmeltery.moltenElectrum = TinkerSmeltery.moltenElectrumFluid.getBlock(); - TinkerSmeltery.moltenEnderFluid = registerFluid("ender", "ender", "fluid.ender", "liquid_ender", 3000, 6000, 295, Material.water); + TinkerSmeltery.moltenEnderFluid = + registerFluid("ender", "ender", "fluid.ender", "liquid_ender", 3000, 6000, 295, Material.water); TinkerSmeltery.moltenEnder = TinkerSmeltery.moltenEnderFluid.getBlock(); TinkerSmeltery.moltenLumiumFluid = registerFluid("lumium"); @@ -271,85 +284,166 @@ public void preInit (FMLPreInitializationEvent event) // Special liquids with different properties/blocks than the rest - TinkerSmeltery.bloodFluid = new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300); + TinkerSmeltery.bloodFluid = + new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isBloodPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.bloodFluid); - TinkerSmeltery.blood = new BloodBlock(TinkerSmeltery.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood"); + TinkerSmeltery.blood = + new BloodBlock(TinkerSmeltery.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood"); GameRegistry.registerBlock(TinkerSmeltery.blood, "liquid.blood"); - if (isBloodPreReg) - { + if (isBloodPreReg) { TinkerSmeltery.bloodFluid = FluidRegistry.getFluid("blood"); Block regBloodBlock = TinkerSmeltery.bloodFluid.getBlock(); - if (regBloodBlock != null) - { + if (regBloodBlock != null) { ((TConstructFluid) TinkerSmeltery.blood).suppressOverwritingFluidIcons(); TinkerSmeltery.blood = regBloodBlock; - } - else - TinkerSmeltery.bloodFluid.setBlock(TinkerSmeltery.blood); + } else TinkerSmeltery.bloodFluid.setBlock(TinkerSmeltery.blood); } - if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 16), new ItemStack(Items.bucket))); - + if (FluidContainerRegistry.fillFluidContainer( + new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(Items.bucket)) + == null) + FluidContainerRegistry.registerFluidContainer(new FluidContainerData( + new FluidStack(TinkerSmeltery.bloodFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 16), + new ItemStack(Items.bucket))); // Glue - TinkerSmeltery.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); + TinkerSmeltery.glueFluid = + new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); boolean isGluePreReg = !FluidRegistry.registerFluid(TinkerSmeltery.glueFluid); - TinkerSmeltery.glueFluidBlock = new GlueFluid(TinkerSmeltery.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep).setBlockName("liquid.glue"); + TinkerSmeltery.glueFluidBlock = new GlueFluid(TinkerSmeltery.glueFluid, Material.water) + .setCreativeTab(TConstructRegistry.blockTab) + .setStepSound(TinkerWorld.slimeStep) + .setBlockName("liquid.glue"); GameRegistry.registerBlock(TinkerSmeltery.glueFluidBlock, "liquid.glue"); - if (isGluePreReg) - { + if (isGluePreReg) { TinkerSmeltery.glueFluid = FluidRegistry.getFluid("glue"); Block regGlueFluidBlock = TinkerSmeltery.glueFluid.getBlock(); - if (regGlueFluidBlock != null) - { + if (regGlueFluidBlock != null) { ((GlueFluid) TinkerSmeltery.glueFluidBlock).suppressOverwritingFluidIcons(); TinkerSmeltery.glueFluidBlock = regGlueFluidBlock; - } - else - TinkerSmeltery.glueFluid.setBlock(TinkerSmeltery.glueFluidBlock); + } else TinkerSmeltery.glueFluid.setBlock(TinkerSmeltery.glueFluidBlock); } - if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 25), new ItemStack(Items.bucket))); + if (FluidContainerRegistry.fillFluidContainer( + new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(Items.bucket)) + == null) + FluidContainerRegistry.registerFluidContainer(new FluidContainerData( + new FluidStack(TinkerSmeltery.glueFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 25), + new ItemStack(Items.bucket))); // PigIron - TinkerSmeltery.pigIronFluid = new Fluid("pigiron.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); + TinkerSmeltery.pigIronFluid = + new Fluid("pigiron.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isPigIronPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.pigIronFluid); - TinkerSmeltery.pigIronFluidBlock = new PigIronMoltenBlock(pigIronFluid, Material.water, "liquid_pigiron").setBlockName("fluid.molten.pigiron"); + TinkerSmeltery.pigIronFluidBlock = new PigIronMoltenBlock(pigIronFluid, Material.water, "liquid_pigiron") + .setBlockName("fluid.molten.pigiron"); GameRegistry.registerBlock(TinkerSmeltery.pigIronFluidBlock, "fluid.molten.pigiron"); - if (isPigIronPreReg) - { + if (isPigIronPreReg) { TinkerSmeltery.pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); Block regPigIronFluid = TinkerSmeltery.pigIronFluid.getBlock(); - if (regPigIronFluid != null) - { + if (regPigIronFluid != null) { ((PigIronMoltenBlock) TinkerSmeltery.pigIronFluidBlock).suppressOverwritingFluidIcons(); TinkerSmeltery.pigIronFluidBlock = regPigIronFluid; - } - else - TinkerSmeltery.pigIronFluid.setBlock(TinkerSmeltery.pigIronFluidBlock); + } else TinkerSmeltery.pigIronFluid.setBlock(TinkerSmeltery.pigIronFluidBlock); } - if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 26), new ItemStack(Items.bucket))); + if (FluidContainerRegistry.fillFluidContainer( + new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(Items.bucket)) + == null) + FluidContainerRegistry.registerFluidContainer(new FluidContainerData( + new FluidStack(TinkerSmeltery.pigIronFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 26), + new ItemStack(Items.bucket))); // blueslime is registered here too because we have the bucket here - if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData(new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 24), new ItemStack(Items.bucket))); - - TinkerSmeltery.fluids = new Fluid[] { TinkerSmeltery.moltenIronFluid, TinkerSmeltery.moltenGoldFluid, TinkerSmeltery.moltenCopperFluid, TinkerSmeltery.moltenTinFluid, TinkerSmeltery.moltenAluminumFluid, TinkerSmeltery.moltenCobaltFluid, TinkerSmeltery.moltenArditeFluid, TinkerSmeltery.moltenBronzeFluid, TinkerSmeltery.moltenAlubrassFluid, TinkerSmeltery.moltenManyullynFluid, TinkerSmeltery.moltenAlumiteFluid, TinkerSmeltery.moltenObsidianFluid, TinkerSmeltery.moltenSteelFluid, TinkerSmeltery.moltenGlassFluid, TinkerSmeltery.moltenStoneFluid, TinkerSmeltery.moltenEmeraldFluid, TinkerSmeltery.bloodFluid, TinkerSmeltery.moltenNickelFluid, TinkerSmeltery.moltenLeadFluid, TinkerSmeltery.moltenSilverFluid, TinkerSmeltery.moltenShinyFluid, TinkerSmeltery.moltenInvarFluid, TinkerSmeltery.moltenElectrumFluid, TinkerSmeltery.moltenEnderFluid, TinkerWorld.blueSlimeFluid, TinkerSmeltery.glueFluid, TinkerSmeltery.pigIronFluid, TinkerSmeltery.moltenQuartzFluid }; - TinkerSmeltery.fluidBlocks = new Block[] { TinkerSmeltery.moltenIron, TinkerSmeltery.moltenGold, TinkerSmeltery.moltenCopper, TinkerSmeltery.moltenTin, TinkerSmeltery.moltenAluminum, TinkerSmeltery.moltenCobalt, TinkerSmeltery.moltenArdite, TinkerSmeltery.moltenBronze, TinkerSmeltery.moltenAlubrass, TinkerSmeltery.moltenManyullyn, TinkerSmeltery.moltenAlumite, TinkerSmeltery.moltenObsidian, TinkerSmeltery.moltenSteel, TinkerSmeltery.moltenGlass, TinkerSmeltery.moltenStone, TinkerSmeltery.moltenEmerald, TinkerSmeltery.blood, TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum, TinkerSmeltery.moltenEnder, TinkerWorld.slimePool, TinkerSmeltery.glueFluidBlock, TinkerSmeltery.pigIronFluidBlock, TinkerSmeltery.moltenLumium, TinkerSmeltery.moltenSignalum, TinkerSmeltery.moltenMithril, TinkerSmeltery.moltenEnderium, TinkerSmeltery.moltenQuartz }; + if (FluidContainerRegistry.fillFluidContainer( + new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(Items.bucket)) + == null) + FluidContainerRegistry.registerFluidContainer(new FluidContainerRegistry.FluidContainerData( + new FluidStack(TinkerWorld.blueSlimeFluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, 24), + new ItemStack(Items.bucket))); + + TinkerSmeltery.fluids = new Fluid[] { + TinkerSmeltery.moltenIronFluid, + TinkerSmeltery.moltenGoldFluid, + TinkerSmeltery.moltenCopperFluid, + TinkerSmeltery.moltenTinFluid, + TinkerSmeltery.moltenAluminumFluid, + TinkerSmeltery.moltenCobaltFluid, + TinkerSmeltery.moltenArditeFluid, + TinkerSmeltery.moltenBronzeFluid, + TinkerSmeltery.moltenAlubrassFluid, + TinkerSmeltery.moltenManyullynFluid, + TinkerSmeltery.moltenAlumiteFluid, + TinkerSmeltery.moltenObsidianFluid, + TinkerSmeltery.moltenSteelFluid, + TinkerSmeltery.moltenGlassFluid, + TinkerSmeltery.moltenStoneFluid, + TinkerSmeltery.moltenEmeraldFluid, + TinkerSmeltery.bloodFluid, + TinkerSmeltery.moltenNickelFluid, + TinkerSmeltery.moltenLeadFluid, + TinkerSmeltery.moltenSilverFluid, + TinkerSmeltery.moltenShinyFluid, + TinkerSmeltery.moltenInvarFluid, + TinkerSmeltery.moltenElectrumFluid, + TinkerSmeltery.moltenEnderFluid, + TinkerWorld.blueSlimeFluid, + TinkerSmeltery.glueFluid, + TinkerSmeltery.pigIronFluid, + TinkerSmeltery.moltenQuartzFluid + }; + TinkerSmeltery.fluidBlocks = new Block[] { + TinkerSmeltery.moltenIron, + TinkerSmeltery.moltenGold, + TinkerSmeltery.moltenCopper, + TinkerSmeltery.moltenTin, + TinkerSmeltery.moltenAluminum, + TinkerSmeltery.moltenCobalt, + TinkerSmeltery.moltenArdite, + TinkerSmeltery.moltenBronze, + TinkerSmeltery.moltenAlubrass, + TinkerSmeltery.moltenManyullyn, + TinkerSmeltery.moltenAlumite, + TinkerSmeltery.moltenObsidian, + TinkerSmeltery.moltenSteel, + TinkerSmeltery.moltenGlass, + TinkerSmeltery.moltenStone, + TinkerSmeltery.moltenEmerald, + TinkerSmeltery.blood, + TinkerSmeltery.moltenNickel, + TinkerSmeltery.moltenLead, + TinkerSmeltery.moltenSilver, + TinkerSmeltery.moltenShiny, + TinkerSmeltery.moltenInvar, + TinkerSmeltery.moltenElectrum, + TinkerSmeltery.moltenEnder, + TinkerWorld.slimePool, + TinkerSmeltery.glueFluidBlock, + TinkerSmeltery.pigIronFluidBlock, + TinkerSmeltery.moltenLumium, + TinkerSmeltery.moltenSignalum, + TinkerSmeltery.moltenMithril, + TinkerSmeltery.moltenEnderium, + TinkerSmeltery.moltenQuartz + }; FluidType.registerFluidType("Water", Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false); FluidType.registerFluidType("Iron", Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true); FluidType.registerFluidType("Gold", Blocks.gold_block, 0, 400, TinkerSmeltery.moltenGoldFluid, false); FluidType.registerFluidType("Tin", TinkerWorld.metalBlock, 5, 400, TinkerSmeltery.moltenTinFluid, false); FluidType.registerFluidType("Copper", TinkerWorld.metalBlock, 3, 550, TinkerSmeltery.moltenCopperFluid, true); - FluidType.registerFluidType("Aluminum", TinkerWorld.metalBlock, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); - FluidType.registerFluidType("NaturalAluminum", TinkerWorld.oreSlag, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); + FluidType.registerFluidType( + "Aluminum", TinkerWorld.metalBlock, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); + FluidType.registerFluidType( + "NaturalAluminum", TinkerWorld.oreSlag, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); FluidType.registerFluidType("Cobalt", TinkerWorld.metalBlock, 0, 650, TinkerSmeltery.moltenCobaltFluid, true); FluidType.registerFluidType("Ardite", TinkerWorld.metalBlock, 1, 650, TinkerSmeltery.moltenArditeFluid, true); - FluidType.registerFluidType("AluminumBrass", TinkerWorld.metalBlock, 7, 350, TinkerSmeltery.moltenAlubrassFluid, false); + FluidType.registerFluidType( + "AluminumBrass", TinkerWorld.metalBlock, 7, 350, TinkerSmeltery.moltenAlubrassFluid, false); FluidType.registerFluidType("Alumite", TinkerWorld.metalBlock, 8, 800, TinkerSmeltery.moltenAlumiteFluid, true); - FluidType.registerFluidType("Manyullyn", TinkerWorld.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true); + FluidType.registerFluidType( + "Manyullyn", TinkerWorld.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true); FluidType.registerFluidType("Bronze", TinkerWorld.metalBlock, 4, 500, TinkerSmeltery.moltenBronzeFluid, true); FluidType.registerFluidType("Steel", TinkerWorld.metalBlock, 9, 700, TinkerSmeltery.moltenSteelFluid, true); FluidType.registerFluidType("Obsidian", Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true); @@ -367,7 +461,26 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock"); TinkerSmeltery.clearGlass.stepSound = Block.soundTypeGlass; TinkerSmeltery.glassPane = new GlassPaneConnected("clear", false); - TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear"); + TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta( + "stained", + true, + "white", + "orange", + "magenta", + "light_blue", + "yellow", + "lime", + "pink", + "gray", + "light_gray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black") + .setBlockName("GlassBlock.StainedClear"); TinkerSmeltery.stainedGlassClear.stepSound = Block.soundTypeGlass; TinkerSmeltery.stainedGlassClearPane = new GlassPaneStained(); @@ -403,34 +516,76 @@ public void preInit (FMLPreInitializationEvent event) // Glass GameRegistry.registerBlock(TinkerSmeltery.clearGlass, GlassBlockItem.class, "GlassBlock"); GameRegistry.registerBlock(TinkerSmeltery.glassPane, GlassPaneItem.class, "GlassPane"); - GameRegistry.registerBlock(TinkerSmeltery.stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); - GameRegistry.registerBlock(TinkerSmeltery.stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); + GameRegistry.registerBlock( + TinkerSmeltery.stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); + GameRegistry.registerBlock( + TinkerSmeltery.stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); - //Items - TinkerSmeltery.metalPattern = new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + // Items + TinkerSmeltery.metalPattern = + new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); GameRegistry.registerItem(TinkerSmeltery.metalPattern, "metalPattern"); TConstructRegistry.addItemToDirectory("metalPattern", TinkerSmeltery.metalPattern); - String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; - for (int i = 0; i < patternTypes.length; i++) - { - TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.metalPattern, 1, i)); + String[] patternTypes = { + "ingot", + "toolRod", + "pickaxeHead", + "shovelHead", + "hatchetHead", + "swordBlade", + "wideGuard", + "handGuard", + "crossbar", + "binding", + "frypanHead", + "signHead", + "knifeBlade", + "chiselHead", + "toughRod", + "toughBinding", + "largePlate", + "broadAxeHead", + "scytheHead", + "excavatorHead", + "largeBlade", + "hammerHead", + "fullGuard" + }; + for (int i = 0; i < patternTypes.length; i++) { + TConstructRegistry.addItemStackToDirectory( + patternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.metalPattern, 1, i)); } - TinkerSmeltery.clayPattern = new ClayPattern("clay_cast_", "materials/").setUnlocalizedName("tconstruct.ClayPattern"); + TinkerSmeltery.clayPattern = + new ClayPattern("clay_cast_", "materials/").setUnlocalizedName("tconstruct.ClayPattern"); GameRegistry.registerItem(TinkerSmeltery.clayPattern, "clayPattern"); TConstructRegistry.addItemToDirectory("clayPattern", TinkerSmeltery.clayPattern); - String[] clayPatternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead" }; - for (int i = 0; i < clayPatternTypes.length; i++) - { - TConstructRegistry.addItemStackToDirectory(clayPatternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.clayPattern, 1, i)); + String[] clayPatternTypes = { + "ingot", + "toolRod", + "pickaxeHead", + "shovelHead", + "hatchetHead", + "swordBlade", + "wideGuard", + "handGuard", + "crossbar", + "binding", + "frypanHead", + "signHead", + "knifeBlade", + "chiselHead" + }; + for (int i = 0; i < clayPatternTypes.length; i++) { + TConstructRegistry.addItemStackToDirectory( + clayPatternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.clayPattern, 1, i)); } oreRegistry(); } @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { proxy.initialize(); craftingTableRecipes(); addRecipesForSmeltery(); @@ -440,89 +595,244 @@ public void init (FMLInitializationEvent event) } @Handler - public void postInit (FMLPostInitializationEvent evt) - { + public void postInit(FMLPostInitializationEvent evt) { addOreDictionarySmelteryRecipes(); modIntegration(); } - private void craftingTableRecipes () - { + private void craftingTableRecipes() { - String[] patSurround = { "###", "#m#", "###" }; + String[] patSurround = {"###", "#m#", "###"}; // stained Glass Recipes - String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; + String[] dyeTypes = { + "dyeBlack", + "dyeRed", + "dyeGreen", + "dyeBrown", + "dyeBlue", + "dyePurple", + "dyeCyan", + "dyeLightGray", + "dyeGray", + "dyePink", + "dyeLime", + "dyeYellow", + "dyeLightBlue", + "dyeMagenta", + "dyeOrange", + "dyeWhite" + }; String color = ""; - for (int i = 0; i < 16; i++) - { + for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', TinkerSmeltery.clearGlass)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, TinkerSmeltery.clearGlass)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', TinkerSmeltery.glassPane)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, TinkerSmeltery.glassPane)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), + patSurround, + 'm', + color, + '#', + TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), + patSurround, + 'm', + color, + '#', + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), + color, + new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), + patSurround, + 'm', + color, + '#', + TinkerSmeltery.glassPane)); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, TinkerSmeltery.glassPane)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), + patSurround, + 'm', + color, + '#', + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), + color, + new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); } // Glass Recipes - GameRegistry.addRecipe(new ItemStack(Items.glass_bottle, 3), new Object[] { "# #", " # ", '#', TinkerSmeltery.clearGlass }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.daylight_detector), new Object[] { "GGG", "QQQ", "WWW", 'G', "blockGlass", 'Q', "gemQuartz", 'W', "slabWood" })); - GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', TinkerSmeltery.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.glassPane, 16, 0), "GGG", "GGG", 'G', TinkerSmeltery.clearGlass)); + GameRegistry.addRecipe( + new ItemStack(Items.glass_bottle, 3), new Object[] {"# #", " # ", '#', TinkerSmeltery.clearGlass}); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(Blocks.daylight_detector), + new Object[] {"GGG", "QQQ", "WWW", 'G', "blockGlass", 'Q', "gemQuartz", 'W', "slabWood"})); + GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { + "GGG", "GSG", "OOO", 'G', TinkerSmeltery.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian + }); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.glassPane, 16, 0), "GGG", "GGG", 'G', TinkerSmeltery.clearGlass)); // Smeltery Components Recipes ItemStack searedBrick = new ItemStack(TinkerTools.materials, 1, 2); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTank, 1, 0), patSurround, '#', searedBrick, 'm', "blockGlass")); // Tank - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Glass - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Window - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTank, 1, 0), + patSurround, + '#', + searedBrick, + 'm', + "blockGlass")); // Tank + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTank, 1, 1), + "bgb", + "ggg", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Glass + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTank, 1, 2), + "bgb", + "bgb", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Window + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel searedBrick = new ItemStack(TinkerTools.materials, 1, 37); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); // Controller - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTankNether, 1, 0), patSurround, '#', searedBrick, 'm', "blockGlass")); // Tank - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTankNether, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Glass - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.lavaTankNether, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "blockGlass")); // Window - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.smelteryNether, 1, 0), + "bbb", + "b b", + "bbb", + 'b', + searedBrick); // Controller + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); // Drain + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); // Bricks + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTankNether, 1, 0), + patSurround, + '#', + searedBrick, + 'm', + "blockGlass")); // Tank + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTankNether, 1, 1), + "bgb", + "ggg", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Glass + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerSmeltery.lavaTankNether, 1, 2), + "bgb", + "bgb", + "bgb", + 'b', + searedBrick, + 'g', + "blockGlass")); // Window + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlockNether, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); // Table + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); // Faucet + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel // Slab Smeltery Components Recipes - for (int i = 0; i < 7; i++) - { - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.speedSlab, 6, i), "bbb", 'b', new ItemStack(TinkerSmeltery.speedBlock, 1, i)); + for (int i = 0; i < 7; i++) { + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.speedSlab, 6, i), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.speedBlock, 1, i)); } - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 0), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 1), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 4)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 2), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 5)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 3), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 6)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 4), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 8)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 5), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 9)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 6), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 10)); - GameRegistry.addRecipe(new ItemStack(TinkerSmeltery.searedSlab, 6, 7), "bbb", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 11)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 0), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 2)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 1), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 4)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 2), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 5)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 3), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 6)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 4), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 8)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 5), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 9)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 6), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 10)); + GameRegistry.addRecipe( + new ItemStack(TinkerSmeltery.searedSlab, 6, 7), + "bbb", + 'b', + new ItemStack(TinkerSmeltery.smeltery, 1, 11)); } - public void addOreDictionarySmelteryRecipes () - { - List exceptions = Arrays.asList(new FluidType[] { FluidType.getFluidType("Water"), FluidType.getFluidType("Stone"), FluidType.getFluidType("Emerald"), FluidType.getFluidType("Quartz"), FluidType.getFluidType("Ender"), FluidType.getFluidType("Glass"), FluidType.getFluidType("Slime"), FluidType.getFluidType("Obsidian") }); + public void addOreDictionarySmelteryRecipes() { + List exceptions = Arrays.asList(new FluidType[] { + FluidType.getFluidType("Water"), + FluidType.getFluidType("Stone"), + FluidType.getFluidType("Emerald"), + FluidType.getFluidType("Quartz"), + FluidType.getFluidType("Ender"), + FluidType.getFluidType("Glass"), + FluidType.getFluidType("Slime"), + FluidType.getFluidType("Obsidian") + }); Iterator iter = FluidType.fluidTypes.entrySet().iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); FluidType ft = (FluidType) pairs.getValue(); - if (exceptions.contains(ft)) - continue; + if (exceptions.contains(ft)) continue; String fluidTypeName = (String) pairs.getKey(); // Nuggets @@ -538,23 +848,26 @@ public void addOreDictionarySmelteryRecipes () Smeltery.addDictionaryMelting("crystalline" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue); // Ores - Smeltery.addDictionaryMelting("ore" + fluidTypeName, ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); + Smeltery.addDictionaryMelting( + "ore" + fluidTypeName, ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); + Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, (int) + (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); // DenseOres support - Smeltery.addDictionaryMelting("denseore" + fluidTypeName, ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 3)); + Smeltery.addDictionaryMelting("denseore" + fluidTypeName, ft, 75, (int) + (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 3)); // DenseOres support - Smeltery.addDictionaryMelting("orePoor" + fluidTypeName, ft, 75, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre)); + Smeltery.addDictionaryMelting( + "orePoor" + fluidTypeName, ft, 75, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre)); // Blocks registerBlockCasting(ft, "block" + fluidTypeName); Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.blockLiquidValue); - if (ft.isToolpart) - { + if (ft.isToolpart) { TinkerTools.registerPatternMaterial("ingot" + fluidTypeName, 2, fluidTypeName); TinkerTools.registerPatternMaterial("block" + fluidTypeName, 18, fluidTypeName); } @@ -575,113 +888,204 @@ public void addOreDictionarySmelteryRecipes () Smeltery.addDictionaryMelting("crystalline" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue); // Ores - Smeltery.addDictionaryMelting("ore" + fluidTypeName, ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); + Smeltery.addDictionaryMelting( + "ore" + fluidTypeName, ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); // Poor ores - Smeltery.addDictionaryMelting("orePoor" + fluidTypeName, ft, 0, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre * 1.5f)); + Smeltery.addDictionaryMelting("orePoor" + fluidTypeName, ft, 0, (int) + (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPerOre * 1.5f)); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); + Smeltery.addDictionaryMelting( + "oreNether" + fluidTypeName, + ft, + 75, + ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); // Blocks - Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.ingotLiquidValue*2); + Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.ingotLiquidValue * 2); - if (ft.isToolpart) - { + if (ft.isToolpart) { TinkerTools.registerPatternMaterial("ingot" + fluidTypeName, 2, fluidTypeName); TinkerTools.registerPatternMaterial("block" + fluidTypeName, 18, fluidTypeName); } } // Compressed materials. max 4x because it's too much otherwise. - for (int i = 1; i <= 4; i++) - { - Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.getFluidType("Stone"), 0, TConstruct.stoneLiquidValue * (int) Math.pow(9, i)); + for (int i = 1; i <= 4; i++) { + Smeltery.addDictionaryMelting( + "compressedCobblestone" + i + "x", + FluidType.getFluidType("Stone"), + 0, + TConstruct.stoneLiquidValue * (int) Math.pow(9, i)); } - Smeltery.addDictionaryMelting("compressedSand1x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9); - Smeltery.addDictionaryMelting("compressedSand2x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9 * 9); + Smeltery.addDictionaryMelting( + "compressedSand1x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9); + Smeltery.addDictionaryMelting( + "compressedSand2x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9 * 9); } - private void addRecipesForTableCasting () - { + private void addRecipesForTableCasting() { /* Smeltery */ ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); ItemStack gemcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 26); - + ItemStack ingotcast_clay = new ItemStack(TinkerSmeltery.clayPattern, 1, 0); ItemStack gemcast_clay = new ItemStack(TinkerSmeltery.clayPattern, 1, 26); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); // Blank - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 1), new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Items.emerald), 80); + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.blankPattern, 1, 1), + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + 80); + tableCasting.addCastingRecipe( + gemcast, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(Items.emerald), + 80); if (!PHConstruct.removeGoldCastRecipes) { - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.blankPattern, 1, 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); - tableCasting.addCastingRecipe(gemcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Items.emerald), 80); + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.blankPattern, 1, 2), + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + 80); + tableCasting.addCastingRecipe( + gemcast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(Items.emerald), + 80); } // Ingots - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 2), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); // stone - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 2), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast_clay, true, 80); // stone - + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 2), + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), + ingotcast, + 80); // stone + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 2), + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), + ingotcast_clay, + true, + 80); // stone // Misc - tableCasting.addCastingRecipe(new ItemStack(Items.emerald), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), gemcast, 80); - tableCasting.addCastingRecipe(new ItemStack(Items.quartz), new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250), gemcast, 50); - tableCasting.addCastingRecipe(new ItemStack(Items.emerald), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), gemcast_clay, true, 80); - tableCasting.addCastingRecipe(new ItemStack(Items.quartz), new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250), gemcast_clay, true, 50); - - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 36), new FluidStack(TinkerSmeltery.glueFluid, TConstruct.ingotLiquidValue), null, 50); - tableCasting.addCastingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 1), new FluidStack(TinkerSmeltery.bloodFluid, 160), null, 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.emerald), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), gemcast, 80); + tableCasting.addCastingRecipe( + new ItemStack(Items.quartz), new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250), gemcast, 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.emerald), + new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), + gemcast_clay, + true, + 80); + tableCasting.addCastingRecipe( + new ItemStack(Items.quartz), + new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250), + gemcast_clay, + true, + 50); + + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 36), + new FluidStack(TinkerSmeltery.glueFluid, TConstruct.ingotLiquidValue), + null, + 50); + tableCasting.addCastingRecipe( + new ItemStack(TinkerWorld.strangeFood, 1, 1), new FluidStack(TinkerSmeltery.bloodFluid, 160), null, 50); // Buckets ItemStack bucket = new ItemStack(Items.bucket); Item thermalBucket = GameRegistry.findItem("ThermalFoundation", "bucket"); - for (int sc = 0; sc < 26; sc++) - { + for (int sc = 0; sc < 26; sc++) { if (TinkerSmeltery.fluids[sc] != null) { // TE support - if(fluids[sc] == TinkerSmeltery.moltenEnderFluid && thermalBucket != null) + if (fluids[sc] == TinkerSmeltery.moltenEnderFluid && thermalBucket != null) // bucket of resonant ender instead of liquified ender - tableCasting.addCastingRecipe(new ItemStack(thermalBucket, 1, 2), new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + tableCasting.addCastingRecipe( + new ItemStack(thermalBucket, 1, 2), + new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), + bucket, + true, + 10); else - tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.buckets, 1, sc), new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + tableCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.buckets, 1, sc), + new FluidStack(TinkerSmeltery.fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), + bucket, + true, + 10); } } // water and lava bucket - tableCasting.addCastingRecipe(new ItemStack(Items.water_bucket), new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); - tableCasting.addCastingRecipe(new ItemStack(Items.lava_bucket), new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + tableCasting.addCastingRecipe( + new ItemStack(Items.water_bucket), + new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME), + bucket, + true, + 10); + tableCasting.addCastingRecipe( + new ItemStack(Items.lava_bucket), + new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME), + bucket, + true, + 10); // Clear glass pane casting - tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.glassPane), new FluidStack(TinkerSmeltery.moltenGlassFluid, 250), null, 80); + tableCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.glassPane), + new FluidStack(TinkerSmeltery.moltenGlassFluid, 250), + null, + 80); // Metal toolpart casting - TinkerSmeltery.liquids = new FluidStack[] { new FluidStack(TinkerSmeltery.moltenIronFluid, 1), new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), new FluidStack(TinkerSmeltery.pigIronFluid, 1) }; - int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; // ItemStack - // damage - // value + TinkerSmeltery.liquids = new FluidStack[] { + new FluidStack(TinkerSmeltery.moltenIronFluid, 1), + new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), + new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), + new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), + new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), + new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), + new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), + new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), + new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), + new FluidStack(TinkerSmeltery.pigIronFluid, 1) + }; + int[] liquidDamage = new int[] {2, 13, 10, 11, 12, 14, 15, 6, 16, 18}; // ItemStack + // damage + // value int fluidAmount = 0; Fluid fs = null; - for (int iter = 0; iter < TinkerTools.patternOutputs.length; iter++) - { - if (TinkerTools.patternOutputs[iter] != null) - { + for (int iter = 0; iter < TinkerTools.patternOutputs.length; iter++) { + if (TinkerTools.patternOutputs[iter] != null) { ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, iter + 1); ItemStack clay_cast = new ItemStack(TinkerSmeltery.clayPattern, 1, iter + 1); - - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) - { + tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), + false, + 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), + false, + 50); + + for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { fs = TinkerSmeltery.liquids[iterTwo].getFluid(); - fluidAmount = ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; + fluidAmount = ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) + * TConstruct.ingotLiquidValue + / 2; ItemStack metalCast = new ItemStack(TinkerTools.patternOutputs[iter], 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50); @@ -690,101 +1094,362 @@ private void addRecipesForTableCasting () } } - tableCasting.addCastingRecipe(new ItemStack(Items.ender_pearl), new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), new ItemStack(TinkerSmeltery.metalPattern, 1, 10), 50); - tableCasting.addCastingRecipe(new ItemStack(Items.ender_pearl), new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), new ItemStack(TinkerSmeltery.metalPattern, 1, 26), 50); - - tableCasting.addCastingRecipe(new ItemStack(Items.ender_pearl), new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), new ItemStack(TinkerSmeltery.clayPattern, 1, 10), true, 50); - tableCasting.addCastingRecipe(new ItemStack(Items.ender_pearl), new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), new ItemStack(TinkerSmeltery.clayPattern, 1, 18), true, 50); - - ItemStack[] ingotShapes = { new ItemStack(Items.brick), new ItemStack(Items.netherbrick), new ItemStack(TinkerTools.materials, 1, 2), new ItemStack(TinkerTools.materials, 1, 37) }; - for (int i = 0; i < ingotShapes.length; i++) - { - tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.ender_pearl), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), + new ItemStack(TinkerSmeltery.metalPattern, 1, 10), + 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.ender_pearl), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), + new ItemStack(TinkerSmeltery.metalPattern, 1, 26), + 50); + + tableCasting.addCastingRecipe( + new ItemStack(Items.ender_pearl), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), + new ItemStack(TinkerSmeltery.clayPattern, 1, 10), + true, + 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.ender_pearl), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), + new ItemStack(TinkerSmeltery.clayPattern, 1, 18), + true, + 50); + + ItemStack[] ingotShapes = { + new ItemStack(Items.brick), + new ItemStack(Items.netherbrick), + new ItemStack(TinkerTools.materials, 1, 2), + new ItemStack(TinkerTools.materials, 1, 37) + }; + for (int i = 0; i < ingotShapes.length; i++) { + tableCasting.addCastingRecipe( + ingotcast, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + ingotShapes[i], + false, + 50); if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(ingotcast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); + tableCasting.addCastingRecipe( + ingotcast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + ingotShapes[i], + false, + 50); } ItemStack fullguardCast = new ItemStack(TinkerSmeltery.metalPattern, 1, 22); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe( + fullguardCast, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), + false, + 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe( + fullguardCast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), + false, + 50); // Golden Food Stuff // 9 gold nuggets FluidStack goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); - tableCasting.addCastingRecipe(new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50); - tableCasting.addCastingRecipe(new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50); // 8 gold ingots goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 8); - tableCasting.addCastingRecipe(new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50); + tableCasting.addCastingRecipe( + new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50); if (TinkerWorld.goldHead != null) - tableCasting.addCustomCastingRecipe(new CastingRecipe(new ItemStack(TinkerWorld.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50, null, true)); - + tableCasting.addCustomCastingRecipe(new CastingRecipe( + new ItemStack(TinkerWorld.goldHead), + goldAmount, + new ItemStack(Items.skull, 1, 3), + true, + 50, + null, + true)); // Ensure TConstruct ingots are always first. Otherwise you might get ingots from other mods from casting - if (PHConstruct.tconComesFirst && TinkerTools.materials != null) - { - //Metal Casting - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 9), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Copper - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 10), new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Tin - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 11), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Aluminum - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 3), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Cobalt - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 4), new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Ardite - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 5), new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Manyullyn - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 13), new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Bronze - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 14), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Alubrass - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 15), new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Alumite - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 16), new FluidStack(moltenSteelFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Steel - - //Clay Casting - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 9), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Copper - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 10), new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Tin - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 11), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Aluminum - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 3), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Cobalt - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 4), new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Ardite - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 5), new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Manyullyn - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 13), new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Bronze - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 14), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Alubrass - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 15), new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Alumite - tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 16), new FluidStack(moltenSteelFluid, TConstruct.ingotLiquidValue), ingotcast_clay, true, 50); //Steel - + if (PHConstruct.tconComesFirst && TinkerTools.materials != null) { + // Metal Casting + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 9), + new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Copper + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 10), + new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Tin + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 11), + new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Aluminum + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 3), + new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Cobalt + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 4), + new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Ardite + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 5), + new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Manyullyn + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 13), + new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Bronze + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 14), + new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Alubrass + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 15), + new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Alumite + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 16), + new FluidStack(moltenSteelFluid, TConstruct.ingotLiquidValue), + ingotcast, + false, + 50); // Steel + + // Clay Casting + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 9), + new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Copper + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 10), + new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Tin + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 11), + new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Aluminum + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 3), + new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Cobalt + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 4), + new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Ardite + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 5), + new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Manyullyn + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 13), + new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Bronze + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 14), + new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Alubrass + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 15), + new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Alumite + tableCasting.addCastingRecipe( + new ItemStack(TinkerTools.materials, 1, 16), + new FluidStack(moltenSteelFluid, TConstruct.ingotLiquidValue), + ingotcast_clay, + true, + 50); // Steel } } - protected void addRecipesForBasinCasting () - { + protected void addRecipesForBasinCasting() { LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); // Block Casting - basinCasting.addCastingRecipe(new ItemStack(Blocks.iron_block), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); // Iron - basinCasting.addCastingRecipe(new ItemStack(Blocks.gold_block), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); // gold - if (PHConstruct.tconComesFirst) - { - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); // copper - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 5), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); // tin - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 6), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); // aluminum - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 0), new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.blockLiquidValue), null, true, 100); // cobalt - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 1), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.blockLiquidValue), null, true, 100); // ardite - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 4), new FluidStack(TinkerSmeltery.moltenBronzeFluid, TConstruct.blockLiquidValue), null, true, 100); // bronze - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 7), new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); // albrass - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 2), new FluidStack(TinkerSmeltery.moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); // manyullyn - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 8), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); // alumite - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 9), new FluidStack(TinkerSmeltery.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); // steel + basinCasting.addCastingRecipe( + new ItemStack(Blocks.iron_block), + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // Iron + basinCasting.addCastingRecipe( + new ItemStack(Blocks.gold_block), + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // gold + if (PHConstruct.tconComesFirst) { + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 3), + new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // copper + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 5), + new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // tin + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 6), + new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // aluminum + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 0), + new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // cobalt + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 1), + new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // ardite + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 4), + new FluidStack(TinkerSmeltery.moltenBronzeFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // bronze + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 7), + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // albrass + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 2), + new FluidStack(TinkerSmeltery.moltenManyullynFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // manyullyn + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 8), + new FluidStack(TinkerSmeltery.moltenAlumiteFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // alumite + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 9), + new FluidStack(TinkerSmeltery.moltenSteelFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // steel } - basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue*2), null, true, 100);// obsidian - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.clearGlass, 1, 0), new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); // glass - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 4), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); // seared + basinCasting.addCastingRecipe( + new ItemStack(Blocks.obsidian), + new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2), + null, + true, + 100); // obsidian + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.clearGlass, 1, 0), + new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), + null, + true, + 100); // glass + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.smeltery, 1, 4), + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue), + null, + true, + 100); // seared // stone - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 5), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.cobblestone), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Blocks.emerald_block), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9), null, true, 100); // emerald - basinCasting.addCastingRecipe(new ItemStack(Blocks.quartz_block), new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250 * 9), null, true, 100); // quartz - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 1, 0), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Blocks.gravel), true, 100); // brownstone - if (PHConstruct.craftEndstone) - { - basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TinkerSmeltery.moltenEnderFluid, 50), new ItemStack(Blocks.obsidian), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), new ItemStack(Blocks.sandstone), true, 100); + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.smeltery, 1, 5), + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.chunkLiquidValue), + new ItemStack(Blocks.cobblestone), + true, + 100); + basinCasting.addCastingRecipe( + new ItemStack(Blocks.emerald_block), + new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9), + null, + true, + 100); // emerald + basinCasting.addCastingRecipe( + new ItemStack(Blocks.quartz_block), + new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250 * 9), + null, + true, + 100); // quartz + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.speedBlock, 1, 0), + new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue), + new ItemStack(Blocks.gravel), + true, + 100); // brownstone + if (PHConstruct.craftEndstone) { + basinCasting.addCastingRecipe( + new ItemStack(Blocks.end_stone), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 50), + new ItemStack(Blocks.obsidian), + true, + 100); + basinCasting.addCastingRecipe( + new ItemStack(Blocks.end_stone), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 250), + new ItemStack(Blocks.sandstone), + true, + 100); } - basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 10), new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), null, true, 100); // ender - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.glueBlock), new FluidStack(TinkerSmeltery.glueFluid, TConstruct.blockLiquidValue), null, true, 100); // glue + basinCasting.addCastingRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 10), + new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), + null, + true, + 100); // ender + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.glueBlock), + new FluidStack(TinkerSmeltery.glueFluid, TConstruct.blockLiquidValue), + null, + true, + 100); // glue // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new // FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), @@ -807,32 +1472,66 @@ protected void addRecipesForBasinCasting () */ } - protected static void addRecipesForSmeltery () - { + protected static void addRecipesForSmeltery() { // Smeltery fuels Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 80); // lava lasts 4 seconds per 15 mb // BLOOD FOR THE BLOOD GOD - if (TinkerWorld.meatBlock != null) - { - Smeltery.addMelting(new ItemStack(Items.rotten_flesh), TinkerWorld.meatBlock, 0, 200, new FluidStack(bloodFluid, 5)); - Smeltery.addMelting(new ItemStack(TinkerWorld.strangeFood, 1, 1), TinkerWorld.meatBlock, 0, 80, new FluidStack(bloodFluid, 160)); + if (TinkerWorld.meatBlock != null) { + Smeltery.addMelting( + new ItemStack(Items.rotten_flesh), TinkerWorld.meatBlock, 0, 200, new FluidStack(bloodFluid, 5)); + Smeltery.addMelting( + new ItemStack(TinkerWorld.strangeFood, 1, 1), + TinkerWorld.meatBlock, + 0, + 80, + new FluidStack(bloodFluid, 160)); } // Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue)); // Bronze - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 1)); // Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.nuggetLiquidValue * 2)); // Alumite - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.nuggetLiquidValue)); // Manyullyn - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.pigIronFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), new FluidStack(FluidRegistry.LAVA, 1000), new FluidStack(FluidRegistry.WATER, 1000)); //Obsidian + Smeltery.addAlloyMixing( + new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) + (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), + new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 3), + new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue)); // Bronze + Smeltery.addAlloyMixing( + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) + (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), + new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 3), + new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 1)); // Aluminum Brass + Smeltery.addAlloyMixing( + new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) + (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), + new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 5), + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue * 2), + new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.nuggetLiquidValue * 2)); // Alumite + Smeltery.addAlloyMixing( + new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) + (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), + new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.nuggetLiquidValue), + new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.nuggetLiquidValue)); // Manyullyn + Smeltery.addAlloyMixing( + new FluidStack(TinkerSmeltery.pigIronFluid, (int) + (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue), + new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), + new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron + Smeltery.addAlloyMixing( + new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), + new FluidStack(FluidRegistry.LAVA, 1000), + new FluidStack(FluidRegistry.WATER, 1000)); // Obsidian // Stone parts FluidType stone = FluidType.getFluidType("Stone"); - for (int sc = 0; sc < TinkerTools.patternOutputs.length; sc++) - { - if (TinkerTools.patternOutputs[sc] != null) - { - Smeltery.addMelting(stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) TinkerTools.woodPattern).getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) / 2); + for (int sc = 0; sc < TinkerTools.patternOutputs.length; sc++) { + if (TinkerTools.patternOutputs[sc] != null) { + Smeltery.addMelting( + stone, + new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), + 1, + (8 + * ((IPattern) TinkerTools.woodPattern) + .getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) + / 2); } } @@ -843,19 +1542,55 @@ protected static void addRecipesForSmeltery () // Chunks Smeltery.addMelting(FluidType.getFluidType("Stone"), new ItemStack(TinkerTools.toolShard, 1, 1), 0, 4); Smeltery.addMelting(iron, new ItemStack(TinkerTools.toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Obsidian"), new ItemStack(TinkerTools.toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Cobalt"), new ItemStack(TinkerTools.toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Ardite"), new ItemStack(TinkerTools.toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Manyullyn"), new ItemStack(TinkerTools.toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Copper"), new ItemStack(TinkerTools.toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Bronze"), new ItemStack(TinkerTools.toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Alumite"), new ItemStack(TinkerTools.toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Obsidian"), + new ItemStack(TinkerTools.toolShard, 1, 6), + 0, + TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Cobalt"), + new ItemStack(TinkerTools.toolShard, 1, 10), + 0, + TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Ardite"), + new ItemStack(TinkerTools.toolShard, 1, 11), + 0, + TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Manyullyn"), + new ItemStack(TinkerTools.toolShard, 1, 12), + 0, + TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Copper"), + new ItemStack(TinkerTools.toolShard, 1, 13), + 0, + TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Bronze"), + new ItemStack(TinkerTools.toolShard, 1, 14), + 0, + TConstruct.chunkLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Alumite"), + new ItemStack(TinkerTools.toolShard, 1, 15), + 0, + TConstruct.chunkLiquidValue); Smeltery.addMelting(steel, new ItemStack(TinkerTools.toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); // Items - Smeltery.addMelting(FluidType.getFluidType("AluminumBrass"), new ItemStack(TinkerTools.blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("AluminumBrass"), + new ItemStack(TinkerTools.blankPattern, 4, 1), + -50, + TConstruct.ingotLiquidValue); Smeltery.addMelting(gold, new ItemStack(TinkerTools.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.getFluidType("Glue"), new ItemStack(TinkerTools.materials, 1, 36), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Glue"), + new ItemStack(TinkerTools.materials, 1, 36), + 0, + TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.getFluidType("Ender"), new ItemStack(Items.ender_pearl, 4), 0, 250); Smeltery.addMelting(TinkerWorld.metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); @@ -873,54 +1608,152 @@ protected static void addRecipesForSmeltery () Smeltery.addMelting(FluidType.getFluidType("Emerald"), new ItemStack(Items.emerald), -50, 640); Smeltery.addMelting(FluidType.getFluidType("Quartz"), new ItemStack(Items.quartz), 0, 250); - Smeltery.addMelting(FluidType.getFluidType("Ardite"), new ItemStack(TinkerTools.materials, 1, 38), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Cobalt"), new ItemStack(TinkerTools.materials, 1, 39), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Aluminum"), new ItemStack(TinkerTools.materials, 1, 40), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Manyullyn"), new ItemStack(TinkerTools.materials, 1, 41), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("AluminumBrass"), new ItemStack(TinkerTools.materials, 1, 42), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Ardite"), + new ItemStack(TinkerTools.materials, 1, 38), + 0, + TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Cobalt"), + new ItemStack(TinkerTools.materials, 1, 39), + 0, + TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Aluminum"), + new ItemStack(TinkerTools.materials, 1, 40), + 0, + TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("Manyullyn"), + new ItemStack(TinkerTools.materials, 1, 41), + 0, + TConstruct.ingotLiquidValue); + Smeltery.addMelting( + FluidType.getFluidType("AluminumBrass"), + new ItemStack(TinkerTools.materials, 1, 42), + 0, + TConstruct.ingotLiquidValue); // Blocks melt as themselves! // Ore - Smeltery.addMelting(Blocks.iron_ore, 0, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Blocks.gold_ore, 0, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(TinkerWorld.oreGravel, 0, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(TinkerWorld.oreGravel, 1, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + Blocks.iron_ore, + 0, + 600, + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + Blocks.gold_ore, + 0, + 400, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + TinkerWorld.oreGravel, + 0, + 600, + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + TinkerWorld.oreGravel, + 1, + 400, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); // Blocks - Smeltery.addMelting(Blocks.iron_block, 0, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Blocks.gold_block, 0, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); - Smeltery.addMelting(Blocks.obsidian, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + Blocks.iron_block, + 0, + 600, + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting( + Blocks.gold_block, + 0, + 400, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting( + Blocks.obsidian, + 0, + 800, + new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); Smeltery.addMelting(Blocks.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); Smeltery.addMelting(Blocks.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); Smeltery.addMelting(Blocks.snow_layer, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); - Smeltery.addMelting(Blocks.sand, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); - Smeltery.addMelting(Blocks.glass, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting( + Blocks.sand, + 0, + 625, + new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting( + Blocks.glass, + 0, + 625, + new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); Smeltery.addMelting(Blocks.glass_pane, 0, 625, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); - Smeltery.addMelting(Blocks.stone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); - Smeltery.addMelting(Blocks.cobblestone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); + Smeltery.addMelting( + Blocks.stone, 0, 800, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); + Smeltery.addMelting( + Blocks.cobblestone, + 0, + 800, + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.stoneLiquidValue)); Smeltery.addMelting(Blocks.emerald_block, 0, 800, new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9)); - Smeltery.addMelting(Blocks.emerald_ore, 0, 800, new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 2)); // the ore also is done here + Smeltery.addMelting( + Blocks.emerald_ore, + 0, + 800, + new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 2)); // the ore also is done here Smeltery.addMelting(Blocks.quartz_block, 0, 800, new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250 * 9)); Smeltery.addMelting(Blocks.quartz_ore, 0, 800, new FluidStack(TinkerSmeltery.moltenQuartzFluid, 250 * 2)); - Smeltery.addMelting(TinkerSmeltery.glueBlock, 0, 250, new FluidStack(TinkerSmeltery.glueFluid, TConstruct.blockLiquidValue)); - Smeltery.addMelting(TinkerTools.craftedSoil, 1, 600, new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); + Smeltery.addMelting( + TinkerSmeltery.glueBlock, + 0, + 250, + new FluidStack(TinkerSmeltery.glueFluid, TConstruct.blockLiquidValue)); + Smeltery.addMelting( + TinkerTools.craftedSoil, + 1, + 600, + new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); Smeltery.addMelting(TinkerSmeltery.clearGlass, 0, 500, new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); Smeltery.addMelting(TinkerSmeltery.glassPane, 0, 350, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); - for (int i = 0; i < 16; i++) - { - Smeltery.addMelting(TinkerSmeltery.stainedGlassClear, i, 500, new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); - Smeltery.addMelting(TinkerSmeltery.stainedGlassClearPane, i, 350, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); + for (int i = 0; i < 16; i++) { + Smeltery.addMelting( + TinkerSmeltery.stainedGlassClear, i, 500, new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000)); + Smeltery.addMelting( + TinkerSmeltery.stainedGlassClearPane, i, 350, new FluidStack(TinkerSmeltery.moltenGlassFluid, 250)); } // Bricks - Smeltery.addMelting(TinkerTools.multiBrick, 4, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TinkerTools.multiBrickFancy, 4, 600, new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TinkerTools.multiBrick, 5, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TinkerTools.multiBrickFancy, 5, 400, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue)); - Smeltery.addMelting(TinkerTools.multiBrick, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(TinkerTools.multiBrickFancy, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + TinkerTools.multiBrick, + 4, + 600, + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting( + TinkerTools.multiBrickFancy, + 4, + 600, + new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting( + TinkerTools.multiBrick, + 5, + 400, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting( + TinkerTools.multiBrickFancy, + 5, + 400, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting( + TinkerTools.multiBrick, + 0, + 800, + new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting( + TinkerTools.multiBrickFancy, + 0, + 800, + new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); // Vanilla blocks Smeltery.addMelting(iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); @@ -930,7 +1763,11 @@ protected static void addRecipesForSmeltery () Smeltery.addMelting(gold, new ItemStack(Blocks.golden_rail), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(iron, new ItemStack(Blocks.detector_rail), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(iron, new ItemStack(Blocks.activator_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.getFluidType("Obsidian"), new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting( + FluidType.getFluidType("Obsidian"), + new ItemStack(Blocks.enchanting_table), + 0, + TConstruct.ingotLiquidValue * 4); // Smeltery.addMelting(iron, new ItemStack(Blocks.cauldron), // 0, TConstruct.ingotLiquidValue * 7); Smeltery.addMelting(iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); @@ -976,104 +1813,161 @@ protected static void addRecipesForSmeltery () Smeltery.addMelting(gold, new ItemStack(Items.golden_carrot, 1, 0), -20, TConstruct.ingotLiquidValue * 8 / 9); } - private void registerIngotCasting (FluidType ft, String name) - { + private void registerIngotCasting(FluidType ft, String name) { ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - for (ItemStack ore : OreDictionary.getOres(name)) - { - tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + for (ItemStack ore : OreDictionary.getOres(name)) { + tableCasting.addCastingRecipe( + pattern, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + false, + 50); if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - - tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); + tableCasting.addCastingRecipe( + pattern, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + false, + 50); + + tableCasting.addCastingRecipe( + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), + pattern, + 80); } } - private void registerNuggetCasting (FluidType ft, String name) - { + private void registerNuggetCasting(FluidType ft, String name) { ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 27); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - for (ItemStack ore : OreDictionary.getOres(name)) - { + for (ItemStack ore : OreDictionary.getOres(name)) { // don't do oreberries. That'd be silly. - if(ore.getItem() != null && ore.getItem() instanceof OreBerries) { + if (ore.getItem() != null && ore.getItem() instanceof OreBerries) { boolean isOreberry = false; - for(int id : OreDictionary.getOreIDs(ore)) - if(OreDictionary.getOreName(id).startsWith("oreberry")) - isOreberry = true; + for (int id : OreDictionary.getOreIDs(ore)) + if (OreDictionary.getOreName(id).startsWith("oreberry")) isOreberry = true; - if(isOreberry) - continue; + if (isOreberry) continue; } - tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe( + pattern, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + false, + 50); if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); - - tableCasting.addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.nuggetLiquidValue), pattern, 40); + tableCasting.addCastingRecipe( + pattern, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + false, + 50); + + tableCasting.addCastingRecipe( + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + new FluidStack(ft.fluid, TConstruct.nuggetLiquidValue), + pattern, + 40); } } - private void registerBlockCasting (FluidType ft, String name) - { - for (ItemStack ore : OreDictionary.getOres(name)) - { - TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.blockLiquidValue), 100); + private void registerBlockCasting(FluidType ft, String name) { + for (ItemStack ore : OreDictionary.getOres(name)) { + TConstructRegistry.getBasinCasting() + .addCastingRecipe( + new ItemStack(ore.getItem(), 1, ore.getItemDamage()), + new FluidStack(ft.fluid, TConstruct.blockLiquidValue), + 100); } } - public void addRecipesForFurnace () - { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerSmeltery.speedBlock, 1, 0), new ItemStack(TinkerSmeltery.speedBlock, 1, 2), 0.2f); + public void addRecipesForFurnace() { + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerSmeltery.speedBlock, 1, 0), + new ItemStack(TinkerSmeltery.speedBlock, 1, 2), + 0.2f); } - public void oreRegistry () - { - String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; - for (int i = 0; i < 16; i++) - { + public void oreRegistry() { + String[] glassTypes = { + "glassBlack", + "glassRed", + "glassGreen", + "glassBrown", + "glassBlue", + "glassPurple", + "glassCyan", + "glassLightGray", + "glassGray", + "glassPink", + "glassLime", + "glassYellow", + "glassLightBlue", + "glassMagenta", + "glassOrange", + "glassWhite" + }; + for (int i = 0; i < 16; i++) { OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i)); } OreDictionary.registerOre("blockGlass", new ItemStack(TinkerSmeltery.clearGlass)); } - public void modIntegration () - { + public void modIntegration() { /* Natura */ Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted"); Block heatSand = GameRegistry.findBlock("Natura", "heatsand"); if (taintedSoil != null && heatSand != null) - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); ArrayList ores; /* Extra Utilities */ ores = OreDictionary.getOres("compressedGravel1x"); - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 9), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.ingotLiquidValue), ores.get(0), true, 100); - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 9), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue / 3), ores.get(0), true, 100); + if (ores.size() > 0) { + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.speedBlock, 9), + new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.ingotLiquidValue), + ores.get(0), + true, + 100); + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.speedBlock, 9), + new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue / 3), + ores.get(0), + true, + 100); } ores = OreDictionary.getOres("compressedGravel2x"); // Higher won't save - // properly - if (ores.size() > 0) - { - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 81), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), ores.get(0), true, 100); - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 81), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue / 3), ores.get(0), true, 100); + // properly + if (ores.size() > 0) { + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.speedBlock, 81), + new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), + ores.get(0), + true, + 100); + basinCasting.addCastingRecipe( + new ItemStack(TinkerSmeltery.speedBlock, 81), + new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue / 3), + ores.get(0), + true, + 100); } /* Rubber */ ores = OreDictionary.getOres("itemRubber"); - if (ores.size() > 0) - { + if (ores.size() > 0) { FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 36), ores.get(0), 0.2f); } } - - public static Fluid registerFluid(String name) { return registerFluid(name, "liquid_" + name); } @@ -1082,12 +1976,20 @@ public static Fluid registerFluid(String name, String texture) { return registerFluid(name, name + ".molten", "fluid.molten." + name, texture, 3000, 6000, 1300, Material.lava); } - public static Fluid registerFluid(String name, String fluidName, String blockName, String texture, int density, int viscosity, int temperature, Material material) { + public static Fluid registerFluid( + String name, + String fluidName, + String blockName, + String texture, + int density, + int viscosity, + int temperature, + Material material) { // create the new fluid - Fluid fluid = new Fluid(fluidName).setDensity(density).setViscosity(viscosity).setTemperature(temperature); + Fluid fluid = + new Fluid(fluidName).setDensity(density).setViscosity(viscosity).setTemperature(temperature); - if(material == Material.lava) - fluid.setLuminosity(12); + if (material == Material.lava) fluid.setLuminosity(12); // register it if it's not already existing boolean isFluidPreRegistered = !FluidRegistry.registerFluid(fluid); @@ -1102,34 +2004,31 @@ public static Fluid registerFluid(String name, String fluidName, String blockNam block.setFluid(fluid); // if the fluid was already registered we use that one instead - if (isFluidPreRegistered) - { + if (isFluidPreRegistered) { fluid = FluidRegistry.getFluid(fluidName); // don't change the fluid icons of already existing fluids - if(fluid.getBlock() != null) - block.suppressOverwritingFluidIcons(); + if (fluid.getBlock() != null) block.suppressOverwritingFluidIcons(); // if no block is registered with an existing liquid, we set our own - else - fluid.setBlock(block); + else fluid.setBlock(block); } - - if (FluidContainerRegistry.fillFluidContainer(new FluidStack(fluid, 1000), new ItemStack(Items.bucket)) == null) { + if (FluidContainerRegistry.fillFluidContainer(new FluidStack(fluid, 1000), new ItemStack(Items.bucket)) + == null) { // custom hacks for teh lookup. hoooray for inconsintency. - if(name.equals("aluminiumbrass")) - name = "alubrass"; - if(name.equals("platinum")) - name = "shiny"; + if (name.equals("aluminiumbrass")) name = "alubrass"; + if (name.equals("platinum")) name = "shiny"; boolean reg = false; - for(int i = 0; i < FilledBucket.textureNames.length; i++) - if(FilledBucket.textureNames[i].equals(name)) { - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(fluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, i), new ItemStack(Items.bucket))); + for (int i = 0; i < FilledBucket.textureNames.length; i++) + if (FilledBucket.textureNames[i].equals(name)) { + FluidContainerRegistry.registerFluidContainer(new FluidContainerData( + new FluidStack(fluid, 1000), + new ItemStack(TinkerSmeltery.buckets, 1, i), + new ItemStack(Items.bucket))); reg = true; } - if(!reg) - TConstruct.logger.error("Couldn't register fluid container for " + name); + if (!reg) TConstruct.logger.error("Couldn't register fluid container for " + name); } return fluid; diff --git a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java index c6764795af0..5ca17c34a2b 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java @@ -1,7 +1,7 @@ package tconstruct.smeltery; -import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.*; +import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import mantle.world.WorldHelper; import net.minecraft.block.Block; @@ -9,31 +9,25 @@ import net.minecraft.item.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraftforge.event.entity.player.*; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.tools.AbilityHelper; import tconstruct.smeltery.blocks.*; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -public class TinkerSmelteryEvents -{ +public class TinkerSmelteryEvents { @SubscribeEvent - public void onCrafting (ItemCraftedEvent event) - { - if (!PHConstruct.beginnerBook) - { + public void onCrafting(ItemCraftedEvent event) { + if (!PHConstruct.beginnerBook) { return; } Item item = event.crafting.getItem(); - if (!event.player.worldObj.isRemote) - { - if (item == Item.getItemFromBlock(TinkerSmeltery.smeltery) || item == Item.getItemFromBlock(TinkerSmeltery.lavaTank)) - { + if (!event.player.worldObj.isRemote) { + if (item == Item.getItemFromBlock(TinkerSmeltery.smeltery) + || item == Item.getItemFromBlock(TinkerSmeltery.lavaTank)) { TPlayerStats stats = TPlayerStats.get(event.player); - if (!stats.smelteryManual) - { + if (!stats.smelteryManual) { stats.smelteryManual = true; AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TinkerTools.manualBook, 1, 2)); } @@ -42,36 +36,26 @@ public void onCrafting (ItemCraftedEvent event) } @SubscribeEvent - public void bucketFill (FillBucketEvent evt) - { - if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == MovingObjectType.BLOCK) - { + public void bucketFill(FillBucketEvent evt) { + if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == MovingObjectType.BLOCK) { int hitX = evt.target.blockX; int hitY = evt.target.blockY; int hitZ = evt.target.blockZ; - if (evt.entityPlayer != null && !evt.entityPlayer.canPlayerEdit(hitX, hitY, hitZ, evt.target.sideHit, evt.current)) - { + if (evt.entityPlayer != null + && !evt.entityPlayer.canPlayerEdit(hitX, hitY, hitZ, evt.target.sideHit, evt.current)) { return; } Block bID = evt.world.getBlock(hitX, hitY, hitZ); - for (int id = 0; id < TinkerSmeltery.fluidBlocks.length; id++) - { - if (bID == TinkerSmeltery.fluidBlocks[id]) - { - if (evt.entityPlayer.capabilities.isCreativeMode) - { + for (int id = 0; id < TinkerSmeltery.fluidBlocks.length; id++) { + if (bID == TinkerSmeltery.fluidBlocks[id]) { + if (evt.entityPlayer.capabilities.isCreativeMode) { WorldHelper.setBlockToAir(evt.world, hitX, hitY, hitZ); - } - else - { - if (TinkerSmeltery.fluidBlocks[id] instanceof LiquidMetalFinite) - { + } else { + if (TinkerSmeltery.fluidBlocks[id] instanceof LiquidMetalFinite) { WorldHelper.setBlockToAir(evt.world, hitX, hitY, hitZ); - } - else - { + } else { WorldHelper.setBlockToAir(evt.world, hitX, hitY, hitZ); } diff --git a/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java index 63dd259e4d8..630fdea6f6d 100644 --- a/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java @@ -6,19 +6,15 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; -public class BloodBlock extends TConstructFluid -{ +public class BloodBlock extends TConstructFluid { - public BloodBlock(Fluid fluid, Material material, String texture) - { + public BloodBlock(Fluid fluid, Material material, String texture) { super(fluid, material, texture); } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (entity instanceof EntityLivingBase) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity instanceof EntityLivingBase) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20 * 5, 1)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index c3dc171cb76..b9e6417ba94 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -15,12 +15,9 @@ /** * @author BluSunrize */ +public class CastingChannelBlock extends BlockContainer { -public class CastingChannelBlock extends BlockContainer -{ - - public CastingChannelBlock() - { + public CastingChannelBlock() { super(Material.rock); this.setHardness(1F); this.setResistance(10); @@ -29,23 +26,20 @@ public CastingChannelBlock() } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) - { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); - if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerSmeltery.castingChannel)) - return false; - else - { + if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerSmeltery.castingChannel)) return false; + else { tile.changeOutputs(player, side, hitX, hitY, hitZ); return true; } } @Override - public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) - { + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); float minX = 0.3125F; float maxX = 0.6875F; @@ -59,38 +53,31 @@ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public int getRenderType () - { + public int getRenderType() { return BlockRenderCastingChannel.renderID; } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.blockIcon = iconRegister.registerIcon("tinker:searedstone"); } @Override - public TileEntity createNewTileEntity (World var1, int var2) - { + public TileEntity createNewTileEntity(World var1, int var2) { return new CastingChannelLogic(); } - } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index 41d3ca80368..9a89ae37978 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -9,71 +9,62 @@ import net.minecraft.world.*; import tconstruct.blocks.TConstructBlock; -public class GlassBlock extends TConstructBlock -{ - static String blockTextures[] = { "glass_clear", "soulglass", "soulglass_clear" }; +public class GlassBlock extends TConstructBlock { + static String blockTextures[] = {"glass_clear", "soulglass", "soulglass_clear"}; - public GlassBlock() - { + public GlassBlock() { super(Material.glass, 3f, blockTextures); } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); return i1 == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override - public float getBlockHardness (World world, int x, int y, int z) - { + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) - { - case 0: - return 0.3F; - case 1: - return 50.0F; - case 2: - return 50.0F; - default: - return blockHardness; + switch (meta) { + case 0: + return 0.3F; + case 1: + return 50.0F; + case 2: + return 50.0F; + default: + return blockHardness; } } @Override - public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) - { + public float getExplosionResistance( + Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) - { - case 0: - return 1.5F; - case 1: - return 2000F; - case 2: - return 2000F; - default: - return getExplosionResistance(entity); + switch (meta) { + case 0: + return 1.5F; + case 1: + return 2000F; + case 2: + return 2000F; + default: + return getExplosionResistance(entity); } } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:glass/" + textureNames[i]); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index b684fd6600f..0c4a361ca0a 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -12,18 +12,15 @@ /** * @author fuj1n - * + * */ - -public class GlassBlockConnected extends MantleBlock -{ +public class GlassBlockConnected extends MantleBlock { protected IIcon[] icons = new IIcon[16]; private boolean shouldRenderSelectionBox = true; protected String folder; private int renderPass; - public GlassBlockConnected(String location, boolean hasAlpha) - { + public GlassBlockConnected(String location, boolean hasAlpha) { super(Material.glass); this.stepSound = soundTypeGlass; folder = location; @@ -33,26 +30,22 @@ public GlassBlockConnected(String location, boolean hasAlpha) } // For FMP support - public IIcon[] getIcons () - { + public IIcon[] getIcons() { return icons; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return renderPass; } @@ -65,556 +58,494 @@ public int getRenderBlockPass () * @param par6 Metadata of the block this block is trying to connect to * @return true if should connect */ - public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) - { + public boolean shouldConnectToBlock( + IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) { return par5 == (Block) this; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons); + public IIcon getIcon(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 + ? icons[0] + : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons); } - public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons) - { - if (PHConstruct.connectedTexturesMode == 0) - { + public IIcon getConnectedBlockTexture( + IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons) { + if (PHConstruct.connectedTexturesMode == 0) { return icons[0]; } boolean isOpenUp = false, isOpenDown = false, isOpenLeft = false, isOpenRight = false; - switch (par5) - { - case 0: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[11]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[12]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[13]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[14]; - } - else if (isOpenDown && isOpenUp) - { - return icons[5]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[6]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[8]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[9]; - } - else if (isOpenDown) - { - return icons[3]; - } - else if (isOpenUp) - { - return icons[4]; - } - else if (isOpenLeft) - { - return icons[2]; - } - else if (isOpenRight) - { - return icons[1]; - } - break; - case 1: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[11]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[12]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[13]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[14]; - } - else if (isOpenDown && isOpenUp) - { - return icons[5]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[6]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[8]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[9]; - } - else if (isOpenDown) - { - return icons[3]; - } - else if (isOpenUp) - { - return icons[4]; - } - else if (isOpenLeft) - { - return icons[2]; - } - else if (isOpenRight) - { - return icons[1]; - } - break; - case 2: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[13]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[14]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[9]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[8]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[4]; - } - else if (isOpenRight) - { - return icons[3]; - } - break; - case 3: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[14]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[13]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[10]; - } - else if (isOpenDown && isOpenRight) - { - return icons[9]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[8]; - } - else if (isOpenUp && isOpenRight) - { - return icons[7]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[3]; - } - else if (isOpenRight) - { - return icons[4]; - } - break; - case 4: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[14]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[13]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[10]; - } - else if (isOpenDown && isOpenRight) - { - return icons[9]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[8]; - } - else if (isOpenUp && isOpenRight) - { - return icons[7]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[3]; - } - else if (isOpenRight) - { - return icons[4]; - } - break; - case 5: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[13]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[14]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[9]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[8]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[4]; - } - else if (isOpenRight) - { - return icons[3]; - } - break; + switch (par5) { + case 0: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[11]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[12]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[13]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[14]; + } else if (isOpenDown && isOpenUp) { + return icons[5]; + } else if (isOpenLeft && isOpenRight) { + return icons[6]; + } else if (isOpenDown && isOpenLeft) { + return icons[8]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[9]; + } else if (isOpenDown) { + return icons[3]; + } else if (isOpenUp) { + return icons[4]; + } else if (isOpenLeft) { + return icons[2]; + } else if (isOpenRight) { + return icons[1]; + } + break; + case 1: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[11]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[12]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[13]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[14]; + } else if (isOpenDown && isOpenUp) { + return icons[5]; + } else if (isOpenLeft && isOpenRight) { + return icons[6]; + } else if (isOpenDown && isOpenLeft) { + return icons[8]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[9]; + } else if (isOpenDown) { + return icons[3]; + } else if (isOpenUp) { + return icons[4]; + } else if (isOpenLeft) { + return icons[2]; + } else if (isOpenRight) { + return icons[1]; + } + break; + case 2: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[13]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[14]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[9]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[8]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[4]; + } else if (isOpenRight) { + return icons[3]; + } + break; + case 3: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[14]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[13]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[10]; + } else if (isOpenDown && isOpenRight) { + return icons[9]; + } else if (isOpenUp && isOpenLeft) { + return icons[8]; + } else if (isOpenUp && isOpenRight) { + return icons[7]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[3]; + } else if (isOpenRight) { + return icons[4]; + } + break; + case 4: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[14]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[13]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[10]; + } else if (isOpenDown && isOpenRight) { + return icons[9]; + } else if (isOpenUp && isOpenLeft) { + return icons[8]; + } else if (isOpenUp && isOpenRight) { + return icons[7]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[3]; + } else if (isOpenRight) { + return icons[4]; + } + break; + case 5: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[13]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[14]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[9]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[8]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[4]; + } else if (isOpenRight) { + return icons[3]; + } + break; } return icons[0]; } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { Block b = par1IBlockAccess.getBlock(par2, par3, par4); return b == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int par1, int par2) - { + public IIcon getIcon(int par1, int par2) { return icons[0]; } @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool (World par1World, int par2, int par3, int par4) - { - if (shouldRenderSelectionBox) - { + public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { + if (shouldRenderSelectionBox) { return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4); - } - else - { + } else { return AxisAlignedBB.getBoundingBox(0D, 0D, 0D, 0D, 0D, 0D); } } @Override - public void registerBlockIcons (IIconRegister par1IconRegister) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { icons[0] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass"); icons[1] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_1_d"); icons[2] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_1_u"); @@ -634,8 +565,7 @@ public void registerBlockIcons (IIconRegister par1IconRegister) } @Override - public boolean canPlaceTorchOnTop (World world, int x, int y, int z) - { + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { return true; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index dad1c2259fc..22a0721caf7 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -12,17 +12,14 @@ /** * @author fuj1n - * + * */ - -public class GlassBlockConnectedMeta extends GlassBlockConnected -{ +public class GlassBlockConnectedMeta extends GlassBlockConnected { public String[] textures; public IIcon[][] icons; boolean ignoreMetaForConnectedGlass = PHConstruct.connectedTexturesMode == 2; - public GlassBlockConnectedMeta(String location, boolean hasAlpha, String... textures) - { + public GlassBlockConnectedMeta(String location, boolean hasAlpha, String... textures) { super(location, hasAlpha); this.textures = textures; this.icons = new IIcon[textures.length][16]; @@ -30,46 +27,38 @@ public GlassBlockConnectedMeta(String location, boolean hasAlpha, String... text @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public IIcon getIcon(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { int meta = par1IBlockAccess.getBlockMetadata(par2, par3, par4); - if (meta < icons.length) - { + if (meta < icons.length) { return getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons[meta]); - } - else - { + } else { return getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons[0]); } } @Override - public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) - { - return par5 == this && (par6 == par1IBlockAccess.getBlockMetadata(par2, par3, par4) || ignoreMetaForConnectedGlass); + public boolean shouldConnectToBlock( + IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) { + return par5 == this + && (par6 == par1IBlockAccess.getBlockMetadata(par2, par3, par4) || ignoreMetaForConnectedGlass); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int par1, int par2) - { + public IIcon getIcon(int par1, int par2) { return icons[par2][0]; } @Override - public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List) - { - for (int i = 0; i < textures.length; i++) - { + public void getSubBlocks(Item b, CreativeTabs par2CreativeTabs, List par3List) { + for (int i = 0; i < textures.length; i++) { par3List.add(new ItemStack(b, 1, i)); } } @Override - public void registerBlockIcons (IIconRegister par1IconRegister) - { - for (int i = 0; i < textures.length; i++) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { + for (int i = 0; i < textures.length; i++) { icons[i][0] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/" + textures[i] + "/glass"); icons[i][1] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/" + textures[i] + "/glass_1_d"); icons[i][2] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/" + textures[i] + "/glass_1_u"); @@ -90,15 +79,12 @@ public void registerBlockIcons (IIconRegister par1IconRegister) } @Override - public int damageDropped (int par1) - { + public int damageDropped(int par1) { return par1; } @Override - public boolean canPlaceTorchOnTop (World world, int x, int y, int z) - { + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { return true; } - } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index 9947fc9cac0..a57268c9be8 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -8,45 +8,55 @@ import net.minecraft.world.IBlockAccess; import tconstruct.blocks.TConstructBlock; -public class GlassBlockStained extends TConstructBlock -{ - static String blockTextures[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; +public class GlassBlockStained extends TConstructBlock { + static String blockTextures[] = { + "white", + "orange", + "magenta", + "lightblue", + "yellow", + "lime", + "pink", + "gray", + "lightgray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black" + }; String textureName; - public GlassBlockStained(String tex) - { + public GlassBlockStained(String tex) { super(Material.glass, 3f, blockTextures); this.textureName = tex; } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 1; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) - { + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { Block block = world.getBlock(x, y, z); return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:glass/" + textureName + textureNames[i]); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPane.java b/src/main/java/tconstruct/smeltery/blocks/GlassPane.java index de1506acf26..3dcc9ae2c86 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPane.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPane.java @@ -3,12 +3,10 @@ import net.minecraft.block.material.Material; import tconstruct.library.TConstructRegistry; -public class GlassPane extends PaneBase -{ - static String blockTextures[] = { "glass_clear", "soulglass", "soulglass_clear" }; +public class GlassPane extends PaneBase { + static String blockTextures[] = {"glass_clear", "soulglass", "soulglass_clear"}; - public GlassPane() - { + public GlassPane() { super(Material.glass, "glass/", blockTextures); this.setHardness(0.3F); this.stepSound = soundTypeGlass; diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index 40a6d2bf8c7..d4f9b13878c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -12,607 +12,539 @@ import tconstruct.smeltery.model.PaneConnectedRender; import tconstruct.util.config.PHConstruct; -public class GlassPaneConnected extends GlassBlockConnected -{ +public class GlassPaneConnected extends GlassBlockConnected { private IIcon theIcon; - public GlassPaneConnected(String location, boolean hasAlpha) - { + public GlassPaneConnected(String location, boolean hasAlpha) { super(location, hasAlpha); } @Override - public int getRenderType () - { + public int getRenderType() { return PaneConnectedRender.model; // return 0; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - if (par5 == 0 || par5 == 1) - { - return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex(); - } - else - { + public IIcon getIcon(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + if (par5 == 0 || par5 == 1) { + return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 + ? icons[15] + : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 + ? icons[15] + : getSideTextureIndex(); + } else { return super.getIcon(par1IBlockAccess, par2, par3, par4, par5); } } @Override - public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons) - { - if (par5 == 0 || par5 == 1) - { + public IIcon getConnectedBlockTexture( + IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons) { + if (par5 == 0 || par5 == 1) { return getSideTextureIndex(); } - if (PHConstruct.connectedTexturesMode == 0) - { + if (PHConstruct.connectedTexturesMode == 0) { return icons[0]; } boolean isOpenUp = false, isOpenDown = false, isOpenLeft = false, isOpenRight = false; - switch (par5) - { - case 0: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[11]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[12]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[13]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[14]; - } - else if (isOpenDown && isOpenUp) - { - return icons[5]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[6]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[8]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[9]; - } - else if (isOpenDown) - { - return icons[3]; - } - else if (isOpenUp) - { - return icons[4]; - } - else if (isOpenLeft) - { - return icons[2]; - } - else if (isOpenRight) - { - return icons[1]; - } - break; - case 1: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[11]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[12]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[13]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[14]; - } - else if (isOpenDown && isOpenUp) - { - return icons[5]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[6]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[8]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[9]; - } - else if (isOpenDown) - { - return icons[3]; - } - else if (isOpenUp) - { - return icons[4]; - } - else if (isOpenLeft) - { - return icons[2]; - } - else if (isOpenRight) - { - return icons[1]; - } - break; - case 2: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[13]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[14]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[9]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[8]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[4]; - } - else if (isOpenRight) - { - return icons[3]; - } - break; - case 3: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[14]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[13]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[10]; - } - else if (isOpenDown && isOpenRight) - { - return icons[9]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[8]; - } - else if (isOpenUp && isOpenRight) - { - return icons[7]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[3]; - } - else if (isOpenRight) - { - return icons[4]; - } - break; - case 4: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[14]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[13]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[10]; - } - else if (isOpenDown && isOpenRight) - { - return icons[9]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[8]; - } - else if (isOpenUp && isOpenRight) - { - return icons[7]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[3]; - } - else if (isOpenRight) - { - return icons[4]; - } - break; - case 5: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) - { - isOpenDown = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) - { - isOpenUp = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) - { - isOpenLeft = true; - } - - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) - { - isOpenRight = true; - } - - if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) - { - return icons[15]; - } - else if (isOpenUp && isOpenDown && isOpenLeft) - { - return icons[13]; - } - else if (isOpenUp && isOpenDown && isOpenRight) - { - return icons[14]; - } - else if (isOpenUp && isOpenLeft && isOpenRight) - { - return icons[11]; - } - else if (isOpenDown && isOpenLeft && isOpenRight) - { - return icons[12]; - } - else if (isOpenDown && isOpenUp) - { - return icons[6]; - } - else if (isOpenLeft && isOpenRight) - { - return icons[5]; - } - else if (isOpenDown && isOpenLeft) - { - return icons[9]; - } - else if (isOpenDown && isOpenRight) - { - return icons[10]; - } - else if (isOpenUp && isOpenLeft) - { - return icons[7]; - } - else if (isOpenUp && isOpenRight) - { - return icons[8]; - } - else if (isOpenDown) - { - return icons[1]; - } - else if (isOpenUp) - { - return icons[2]; - } - else if (isOpenLeft) - { - return icons[4]; - } - else if (isOpenRight) - { - return icons[3]; - } - break; + switch (par5) { + case 0: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[11]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[12]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[13]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[14]; + } else if (isOpenDown && isOpenUp) { + return icons[5]; + } else if (isOpenLeft && isOpenRight) { + return icons[6]; + } else if (isOpenDown && isOpenLeft) { + return icons[8]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[9]; + } else if (isOpenDown) { + return icons[3]; + } else if (isOpenUp) { + return icons[4]; + } else if (isOpenLeft) { + return icons[2]; + } else if (isOpenRight) { + return icons[1]; + } + break; + case 1: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[11]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[12]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[13]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[14]; + } else if (isOpenDown && isOpenUp) { + return icons[5]; + } else if (isOpenLeft && isOpenRight) { + return icons[6]; + } else if (isOpenDown && isOpenLeft) { + return icons[8]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[9]; + } else if (isOpenDown) { + return icons[3]; + } else if (isOpenUp) { + return icons[4]; + } else if (isOpenLeft) { + return icons[2]; + } else if (isOpenRight) { + return icons[1]; + } + break; + case 2: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[13]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[14]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[9]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[8]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[4]; + } else if (isOpenRight) { + return icons[3]; + } + break; + case 3: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 - 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2 + 1, par3, par4), + par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[14]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[13]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[10]; + } else if (isOpenDown && isOpenRight) { + return icons[9]; + } else if (isOpenUp && isOpenLeft) { + return icons[8]; + } else if (isOpenUp && isOpenRight) { + return icons[7]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[3]; + } else if (isOpenRight) { + return icons[4]; + } + break; + case 4: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[14]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[13]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[10]; + } else if (isOpenDown && isOpenRight) { + return icons[9]; + } else if (isOpenUp && isOpenLeft) { + return icons[8]; + } else if (isOpenUp && isOpenRight) { + return icons[7]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[3]; + } else if (isOpenRight) { + return icons[4]; + } + break; + case 5: + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 - 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3 + 1, par4), + par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 - 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock( + par1IBlockAccess, + par2, + par3, + par4, + par1IBlockAccess.getBlock(par2, par3, par4 + 1), + par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[13]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[14]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[9]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[8]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[4]; + } else if (isOpenRight) { + return icons[3]; + } + break; } return icons[0]; } @Override - public void addCollisionBoxesToList (World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) - { + public void addCollisionBoxesToList( + World par1World, + int par2, + int par3, + int par4, + AxisAlignedBB par5AxisAlignedBB, + List par6List, + Entity par7Entity) { boolean flag = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.NORTH); boolean flag1 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.SOUTH); boolean flag2 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.WEST); boolean flag3 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.EAST); - if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) - { - if (flag2 && !flag3) - { + if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) { + if (flag2 && !flag3) { this.setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); - } - else if (!flag2 && flag3) - { + } else if (!flag2 && flag3) { this.setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } - } - else - { + } else { this.setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } - if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) - { - if (flag && !flag1) - { + if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) { + if (flag && !flag1) { this.setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); - } - else if (!flag && flag1) - { + } else if (!flag && flag1) { this.setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } - } - else - { + } else { this.setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } } @Override - public void setBlockBoundsForItemRender () - { + public void setBlockBoundsForItemRender() { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @Override - public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { float f = 0.4375F; float f1 = 0.5625F; float f2 = 0.4375F; @@ -622,36 +554,24 @@ public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, boolean flag2 = this.canPaneConnectTo(par1IBlockAccess, par2, par3, par4, ForgeDirection.WEST); boolean flag3 = this.canPaneConnectTo(par1IBlockAccess, par2, par3, par4, ForgeDirection.EAST); - if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) - { - if (flag2 && !flag3) - { + if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) { + if (flag2 && !flag3) { f = 0.0F; - } - else if (!flag2 && flag3) - { + } else if (!flag2 && flag3) { f1 = 1.0F; } - } - else - { + } else { f = 0.0F; f1 = 1.0F; } - if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) - { - if (flag && !flag1) - { + if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) { + if (flag && !flag1) { f2 = 0.0F; - } - else if (!flag && flag1) - { + } else if (!flag && flag1) { f3 = 1.0F; } - } - else - { + } else { f2 = 0.0F; f3 = 1.0F; } @@ -659,31 +579,27 @@ else if (!flag && flag1) this.setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3); } - public IIcon getSideTextureIndex () - { + public IIcon getSideTextureIndex() { return this.theIcon; } - public final boolean canThisPaneConnectToThisBlock (Block b) - { + public final boolean canThisPaneConnectToThisBlock(Block b) { return b.isOpaqueCube() || b == (Block) this || b == Blocks.glass; } @Override - public void registerBlockIcons (IIconRegister par1IconRegister) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { super.registerBlockIcons(par1IconRegister); this.theIcon = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_side"); } - public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, ForgeDirection dir) - { - return canThisPaneConnectToThisBlock(access.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) || access.isSideSolid(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); + public boolean canPaneConnectTo(IBlockAccess access, int x, int y, int z, ForgeDirection dir) { + return canThisPaneConnectToThisBlock(access.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) + || access.isSideSolid(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java index 9123ebfac04..3724a369a56 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneStained.java @@ -3,12 +3,27 @@ import net.minecraft.block.material.Material; import tconstruct.library.TConstructRegistry; -public class GlassPaneStained extends PaneBase -{ - static String blockTextures[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; +public class GlassPaneStained extends PaneBase { + static String blockTextures[] = { + "white", + "orange", + "magenta", + "lightblue", + "yellow", + "lime", + "pink", + "gray", + "lightgray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black" + }; - public GlassPaneStained() - { + public GlassPaneStained() { super(Material.glass, "glass/", assembleBlockTextures()); // TODO setHardness this.setHardness(0.3F); @@ -17,25 +32,21 @@ public GlassPaneStained() this.setCreativeTab(TConstructRegistry.blockTab); } - private static String[] assembleBlockTextures () - { + private static String[] assembleBlockTextures() { String[] textures = new String[blockTextures.length]; - for (int i = 0; i < blockTextures.length; i++) - { + for (int i = 0; i < blockTextures.length; i++) { textures[i] = "stainedglass_" + blockTextures[i]; } return textures; } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 1; } @Override - public int damageDropped (int par1) - { + public int damageDropped(int par1) { return par1; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java index 9414ffb615a..be411d04960 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java @@ -8,22 +8,18 @@ import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; -public class GlueBlock extends TConstructBlock -{ +public class GlueBlock extends TConstructBlock { - public GlueBlock() - { - super(Material.ground, 4.0f, new String[] { "glue" }); + public GlueBlock() { + super(Material.ground, 4.0f, new String[] {"glue"}); } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.motionX *= 0.1; entity.motionZ *= 0.1; - if (entity instanceof EntityLivingBase) - { + if (entity instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) entity; // Well you'd feel ill too standing on glue... living.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); @@ -34,9 +30,7 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z); } - } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java index f1f87db24e3..8fe1de59132 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java @@ -9,47 +9,39 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.*; -public class GlueFluid extends BlockFluidFinite -{ +public class GlueFluid extends BlockFluidFinite { IIcon stillIcon; IIcon flowIcon; boolean overwriteFluidIcons = true; - public GlueFluid(Fluid fluid, Material material) - { + public GlueFluid(Fluid fluid, Material material) { super(fluid, material); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:liquid_glue"); flowIcon = iconRegister.registerIcon("tinker:liquid_glue_flow"); - if (this.overwriteFluidIcons) - this.getFluid().setIcons(stillIcon, flowIcon); + if (this.overwriteFluidIcons) this.getFluid().setIcons(stillIcon, flowIcon); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (side == 0 || side == 1) - return stillIcon; + public IIcon getIcon(int side, int meta) { + if (side == 0 || side == 1) return stillIcon; return flowIcon; } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.motionX *= 0.1; entity.motionZ *= 0.1; - if (entity instanceof EntityLivingBase) - { + if (entity instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) entity; // Well you'd feel ill too standing in glue... living.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); @@ -59,8 +51,7 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity } } - public void suppressOverwritingFluidIcons () - { + public void suppressOverwritingFluidIcons() { this.overwriteFluidIcons = false; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index 68b3376f71a..3a4fbbef2d8 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -2,6 +2,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import mantle.blocks.iface.IServantLogic; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -26,15 +27,11 @@ import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.smeltery.model.TankRender; -import java.util.List; - -public class LavaTankBlock extends BlockContainer -{ +public class LavaTankBlock extends BlockContainer { public IIcon[] icons; String texturePrefix = ""; - public LavaTankBlock() - { + public LavaTankBlock() { super(Material.rock); setHardness(3F); setResistance(20F); @@ -43,73 +40,70 @@ public LavaTankBlock() setStepSound(Block.soundTypeGrass); } - public LavaTankBlock(String prefix) - { + public LavaTankBlock(String prefix) { this(); texturePrefix = prefix; } - public String[] getTextureNames () - { - String[] textureNames = { "lavatank_side", "lavatank_top", "searedgague_top", "searedgague_side", "searedgague_bottom", "searedwindow_top", "searedwindow_side", "searedwindow_bottom" }; + public String[] getTextureNames() { + String[] textureNames = { + "lavatank_side", + "lavatank_top", + "searedgague_top", + "searedgague_side", + "searedgague_bottom", + "searedwindow_top", + "searedwindow_side", + "searedwindow_bottom" + }; if (!texturePrefix.equals("")) - for (int i = 0; i < textureNames.length; i++) - textureNames[i] = texturePrefix + "_" + textureNames[i]; + for (int i = 0; i < textureNames.length; i++) textureNames[i] = texturePrefix + "_" + textureNames[i]; return textureNames; } @Override - public void registerBlockIcons (IIconRegister IIconRegister) - { + public void registerBlockIcons(IIconRegister IIconRegister) { String[] textureNames = getTextureNames(); this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = IIconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 1; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) - { + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { Block bID = world.getBlock(x, y, z); return bID == this ? false : super.shouldSideBeRendered(world, x, y, z, side); } @Override - public boolean canRenderInPass (int pass) - { + public boolean canRenderInPass(int pass) { TankRender.renderPass = pass; return true; } @Override - public int getLightValue (IBlockAccess world, int x, int y, int z) - { + public int getLightValue(IBlockAccess world, int x, int y, int z) { TileEntity logic = world.getTileEntity(x, y, z); - if (logic != null && logic instanceof LavaTankLogic) - return ((LavaTankLogic) logic).getBrightness(); + if (logic != null && logic instanceof LavaTankLogic) return ((LavaTankLogic) logic).getBrightness(); return 0; } @@ -118,89 +112,78 @@ public int getLightValue (IBlockAccess world, int x, int y, int z) */ @Override - public int getRenderType () - { + public int getRenderType() { return TankRender.tankModelID; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta >= 3) - meta = 0; - if (meta == 0) - { - if (side == 0 || side == 1) - { + public IIcon getIcon(int side, int meta) { + if (meta >= 3) meta = 0; + if (meta == 0) { + if (side == 0 || side == 1) { return icons[1]; - } - else - { + } else { return icons[0]; } - } - else - { + } else { return icons[meta * 3 + getTextureIndex(side) - 1]; } } - public int getTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } @Override - public TileEntity createTileEntity (World world, int metadata) - { + public TileEntity createTileEntity(World world, int metadata) { return new LavaTankLogic(); } @Override - public boolean onBlockActivated (World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) - { + public boolean onBlockActivated( + World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { ItemStack current = entityplayer.inventory.getCurrentItem(); - if (current != null) - { + if (current != null) { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current); LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(i, j, k); // putting liquid into the tank - if (liquid != null && !world.isRemote) - { + if (liquid != null && !world.isRemote) { int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false); - if (amount == liquid.amount) - { + if (amount == liquid.amount) { logic.fill(ForgeDirection.UNKNOWN, liquid, true); if (!entityplayer.capabilities.isCreativeMode) - entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, consumeItem(current)); + entityplayer.inventory.setInventorySlotContents( + entityplayer.inventory.currentItem, consumeItem(current)); // update entityplayer.inventoryContainer.detectAndSendChanges(); - world.markBlockForUpdate(i,j,k); + world.markBlockForUpdate(i, j, k); } return true; } // taking liquit out of the tank - else if (FluidContainerRegistry.isBucket(current)) - { + else if (FluidContainerRegistry.isBucket(current)) { FluidTankInfo[] tanks = logic.getTankInfo(ForgeDirection.UNKNOWN); - FluidStack fillFluid = tanks[0].fluid;// getFluid(); - if(!world.isRemote) { + FluidStack fillFluid = tanks[0].fluid; // getFluid(); + if (!world.isRemote) { ItemStack fillStack = FluidContainerRegistry.fillFluidContainer(fillFluid, current); if (fillStack != null) { - logic.drain(ForgeDirection.UNKNOWN, FluidContainerRegistry.getFluidForFilledItem(fillStack).amount, true); + logic.drain( + ForgeDirection.UNKNOWN, + FluidContainerRegistry.getFluidForFilledItem(fillStack).amount, + true); if (!entityplayer.capabilities.isCreativeMode && !world.isRemote) { if (current.stackSize == 1) { - entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, fillStack); + entityplayer.inventory.setInventorySlotContents( + entityplayer.inventory.currentItem, fillStack); } else { - entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, consumeItem(current)); + entityplayer.inventory.setInventorySlotContents( + entityplayer.inventory.currentItem, consumeItem(current)); if (!entityplayer.inventory.addItemStackToInventory(fillStack)) { entityplayer.dropPlayerItemWithRandomChoice(fillStack, false); @@ -222,17 +205,11 @@ else if (FluidContainerRegistry.isBucket(current)) return false; } - public static ItemStack consumeItem (ItemStack stack) - { - if (stack.stackSize == 1) - { - if (stack.getItem().hasContainerItem()) - return stack.getItem().getContainerItem(stack); - else - return null; - } - else - { + public static ItemStack consumeItem(ItemStack stack) { + if (stack.stackSize == 1) { + if (stack.getItem().hasContainerItem()) return stack.getItem().getContainerItem(stack); + else return null; + } else { stack.splitStack(1); return stack; @@ -240,60 +217,49 @@ public static ItemStack consumeItem (ItemStack stack) } @Override - public TileEntity createNewTileEntity (World world, int test) - { + public TileEntity createNewTileEntity(World world, int test) { return createTileEntity(world, 0); } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 3; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 3; iter++) { list.add(new ItemStack(id, 1, iter)); } } /* Data */ @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { return meta; } /* Updates */ - public void onNeighborBlockChange (World world, int x, int y, int z, Block nBlockID) - { + public void onNeighborBlockChange(World world, int x, int y, int z, Block nBlockID) { TileEntity logic = world.getTileEntity(x, y, z); - if (logic instanceof IServantLogic) - { + if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); } } @Override - public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z) - { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { player.addExhaustion(0.025F); int meta = world.getBlockMetadata(x, y, z); ItemStack stack = new ItemStack(this, 1, meta); LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); FluidStack liquid = logic.tank.getFluid(); - if (liquid != null) - { + if (liquid != null) { LavaTankItemBlock lavaTankItemBlock = (LavaTankItemBlock) stack.getItem(); lavaTankItemBlock.setFluid(stack, liquid); } - if (!player.capabilities.isCreativeMode || player.isSneaking()) - dropTankBlock(world, x, y, z, stack); + if (!player.capabilities.isCreativeMode || player.isSneaking()) dropTankBlock(world, x, y, z, stack); return world.setBlockToAir(x, y, z); } - protected void dropTankBlock (World world, int x, int y, int z, ItemStack stack) - { - if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) - { + protected void dropTankBlock(World world, int x, int y, int z, ItemStack stack) { + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { float f = 0.7F; double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; @@ -305,14 +271,10 @@ protected void dropTankBlock (World world, int x, int y, int z, ItemStack stack) } @Override - public void harvestBlock (World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) - { - - } + public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) {} @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) - { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) { LavaTankItemBlock lavaTankItemBlock = (LavaTankItemBlock) stack.getItem(); FluidStack liquid = lavaTankItemBlock.getFluid(stack); if (liquid != null) { @@ -321,22 +283,19 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase } } - //Comparator + // Comparator @Override - public boolean hasComparatorInputOverride () - { + public boolean hasComparatorInputOverride() { return true; } @Override - public int getComparatorInputOverride (World world, int x, int y, int z, int comparatorSide) - { + public int getComparatorInputOverride(World world, int x, int y, int z, int comparatorSide) { return getTankLogic(world, x, y, z).comparatorStrength(); } - public static LavaTankLogic getTankLogic (IBlockAccess blockAccess, int par1, int par2, int par3) - { + public static LavaTankLogic getTankLogic(IBlockAccess blockAccess, int par1, int par2, int par3) { return (LavaTankLogic) blockAccess.getTileEntity(par1, par2, par3); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java index eb9ead889c0..8adabc101b2 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java @@ -10,53 +10,44 @@ import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -public class LiquidMetalFinite extends BlockFluidFinite -{ +public class LiquidMetalFinite extends BlockFluidFinite { String texture; public IIcon stillIcon; public IIcon flowIcon; - public LiquidMetalFinite(Fluid fluid, String texture) - { + public LiquidMetalFinite(Fluid fluid, String texture) { super(fluid, TinkerSmeltery.liquidMetal); this.texture = texture; this.setCreativeTab(TConstructRegistry.blockTab); } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 0; } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:" + texture); flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow"); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (side == 0 || side == 1) - return stillIcon; + public IIcon getIcon(int side, int meta) { + if (side == 0 || side == 1) return stillIcon; return flowIcon; } @Override - public void onEntityCollidedWithBlock (World par1World, int x, int y, int z, Entity entity) - { - if (entity instanceof EntityLivingBase) - { + public void onEntityCollidedWithBlock(World par1World, int x, int y, int z, Entity entity) { + if (entity instanceof EntityLivingBase) { entity.motionX *= 0.4D; entity.motionZ *= 0.4D; } - if (!(entity instanceof EntityItem) && !entity.isImmuneToFire()) - { + if (!(entity instanceof EntityItem) && !entity.isImmuneToFire()) { entity.attackEntityFrom(DamageSource.lava, 4.0F); entity.setFire(15); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java index 09e1e6ed2ff..159d64cff34 100644 --- a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java +++ b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java @@ -7,29 +7,22 @@ import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; -public class MetalOre extends TConstructBlock -{ - public MetalOre(Material material, float hardness, String[] tex) - { +public class MetalOre extends TConstructBlock { + public MetalOre(Material material, float hardness, String[] tex) { super(material, hardness, tex); } @Override - public float getBlockHardness (World world, int x, int y, int z) - { + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta <= 2) - return 10f; - else - return 3f; + if (meta <= 2) return 10f; + else return 3f; // return this.blockHardness; } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 1; iter < 6; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 1; iter < 6; iter++) { list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java index 4961f34aebb..0043eacbbc9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -10,15 +10,13 @@ import net.minecraft.util.IIcon; import tconstruct.smeltery.model.PaneRender; -public class PaneBase extends BlockStainedGlassPane -{ +public class PaneBase extends BlockStainedGlassPane { public String[] textureNames; public String folder; public IIcon[] icons; public IIcon[] sideIcons; - public PaneBase(Material material, String folder, String[] blockTextures) - { + public PaneBase(Material material, String folder, String[] blockTextures) { super(); textureNames = blockTextures; this.folder = folder; @@ -26,13 +24,11 @@ public PaneBase(Material material, String folder, String[] blockTextures) @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; this.sideIcons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]); this.sideIcons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i] + "_side"); } @@ -40,49 +36,41 @@ public void registerBlockIcons (IIconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public IIcon func_149735_b (int p_149735_1_, int p_149735_2_) - { + public IIcon func_149735_b(int p_149735_1_, int p_149735_2_) { return icons[p_149735_2_]; } @Override @SideOnly(Side.CLIENT) - public IIcon func_150104_b (int p_150104_1_) - { + public IIcon func_150104_b(int p_150104_1_) { return sideIcons[p_150104_1_]; } @Override - public IIcon getIcon (int p_149691_1_, int p_149691_2_) - { + public IIcon getIcon(int p_149691_1_, int p_149691_2_) { return icons[p_149691_2_]; } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < textureNames.length; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < textureNames.length; iter++) { list.add(new ItemStack(b, 1, iter)); } } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public int getRenderType () - { + public int getRenderType() { return PaneRender.model; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java b/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java index f81fedced87..5d7fb4dbfff 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/PigIronMoltenBlock.java @@ -6,31 +6,25 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; -public class PigIronMoltenBlock extends TConstructFluid -{ +public class PigIronMoltenBlock extends TConstructFluid { - public PigIronMoltenBlock(Fluid fluid, Material material, String texture) - { + public PigIronMoltenBlock(Fluid fluid, Material material, String texture) { super(fluid, material, texture); } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.stillIcon = iconRegister.registerIcon("tinker:" + texture); this.flowIcon = iconRegister.registerIcon("tinker:" + texture); - if (this.overwriteFluidIcons) - this.getFluid().setIcons(stillIcon, flowIcon); + if (this.overwriteFluidIcons) this.getFluid().setIcons(stillIcon, flowIcon); } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (!world.isRemote && entity != null && !entity.isWet()) - entity.setFire(40); + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity != null && !entity.isWet()) entity.setFire(40); if (!entity.isWet() || world.rand.nextInt(100) > 73) - world.playSoundAtEntity(entity, "random.fizz", 0.7F, 1.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.4F); + world.playSoundAtEntity( + entity, "random.fizz", 0.7F, 1.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.4F); } - } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index af435046a1c..6e29305e3ac 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -11,19 +11,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; -import net.minecraftforge.common.MinecraftForge; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.library.event.SmelteryEvent; -import tconstruct.library.tools.AbilityHelper; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.CastingBlockRender; -public class SearedBlock extends InventoryBlock -{ +public class SearedBlock extends InventoryBlock { - public SearedBlock() - { + public SearedBlock() { super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(3F); @@ -31,75 +26,63 @@ public SearedBlock() setStepSound(soundTypeMetal); } - public SearedBlock(String texture) - { + public SearedBlock(String texture) { this(); this.texturePrefix = texture; } @Override - public TileEntity createTileEntity (World world, int metadata) - { - switch (metadata) - { - case 0: - return new CastingTableLogic(); - case 1: - return new FaucetLogic(); - case 2: - return new CastingBasinLogic(); - default: - return null; + public TileEntity createTileEntity(World world, int metadata) { + switch (metadata) { + case 0: + return new CastingTableLogic(); + case 1: + return new FaucetLogic(); + case 2: + return new CastingBasinLogic(); + default: + return null; } } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 0; } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return null; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } /* Activation */ @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) - { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { int md = world.getBlockMetadata(x, y, z); // casting table or basin - if (md == 0 || md == 2) - { + if (md == 0 || md == 2) { return activateCastingBlock(world, x, y, z, player); } // faucet - else if (md == 1) - { - if (player.isSneaking()) - return false; + else if (md == 1) { + if (player.isSneaking()) return false; - if(!world.isRemote) { + if (!world.isRemote) { FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); logic.setActive(true); } return true; - } - else - return super.onBlockActivated(world, x, y, z, player, side, clickX, clickY, clickZ); + } else return super.onBlockActivated(world, x, y, z, player, side, clickX, clickY, clickZ); } - boolean activateCastingBlock (World world, int x, int y, int z, EntityPlayer player) - { - if(!world.isRemote) { + boolean activateCastingBlock(World world, int x, int y, int z, EntityPlayer player) { + if (!world.isRemote) { CastingBlockLogic logic = (CastingBlockLogic) world.getTileEntity(x, y, z); logic.interact(player); world.markBlockForUpdate(x, y, z); @@ -109,118 +92,104 @@ boolean activateCastingBlock (World world, int x, int y, int z, EntityPlayer pla /* Rendering */ @Override - public int getRenderType () - { + public int getRenderType() { return CastingBlockRender.searedModel; } String texturePrefix = ""; @Override - public String[] getTextureNames () - { - String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", "blockcast_side", "blockcast_bottom" }; + public String[] getTextureNames() { + String[] textureNames = { + "castingtable_top", + "castingtable_side", + "castingtable_bottom", + "faucet", + "blockcast_top", + "blockcast_side", + "blockcast_bottom" + }; if (!texturePrefix.equals("")) - for (int i = 0; i < textureNames.length; i++) - textureNames[i] = texturePrefix + "_" + textureNames[i]; + for (int i = 0; i < textureNames.length; i++) textureNames[i] = texturePrefix + "_" + textureNames[i]; return textureNames; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } // TODO getIcon @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta == 0) - return icons[getTextureIndex(side)]; - else if (meta == 2) - return icons[getTextureIndex(side) + 4]; - else - return icons[3]; + public IIcon getIcon(int side, int meta) { + if (meta == 0) return icons[getTextureIndex(side)]; + else if (meta == 2) return icons[getTextureIndex(side) + 4]; + else return icons[3]; } - public int getTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 3; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 3; iter++) { list.add(new ItemStack(id, 1, iter)); } } @Override - public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) - { + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta != 1) - { + if (meta != 1) { this.setBlockBounds(0, 0, 0, 1, 1, 1); - } - else - { + } else { TileEntity te = world.getTileEntity(x, y, z); float xMin = 0.25F; float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; - if (te instanceof FaucetLogic) - { + if (te instanceof FaucetLogic) { FaucetLogic logic = (FaucetLogic) te; - switch (logic.getRenderDirection()) - { - case 2: - zMin = 0.625F; - zMax = 1.0F; - break; - case 3: - zMax = 0.375F; - zMin = 0F; - break; - case 4: - xMin = 0.625F; - xMax = 1.0F; - break; - case 5: - xMax = 0.375F; - xMin = 0F; - break; + switch (logic.getRenderDirection()) { + case 2: + zMin = 0.625F; + zMax = 1.0F; + break; + case 3: + zMax = 0.375F; + zMin = 0F; + break; + case 4: + xMin = 0.625F; + xMax = 1.0F; + break; + case 5: + xMax = 0.375F; + xMin = 0F; + break; } } @@ -229,45 +198,45 @@ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta != 1) - { + if (meta != 1) { return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); - } - else - { + } else { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof FaucetLogic) - { + if (tile != null && tile instanceof FaucetLogic) { FaucetLogic logic = (FaucetLogic) tile; float xMin = 0.25F; float xMax = 0.75F; float zMin = 0.25F; float zMax = 0.75F; - switch (logic.getRenderDirection()) - { - case 2: - zMin = 0.625F; - zMax = 1.0F; - break; - case 3: - zMax = 0.375F; - zMin = 0F; - break; - case 4: - xMin = 0.625F; - xMax = 1.0F; - break; - case 5: - xMax = 0.375F; - xMin = 0F; - break; + switch (logic.getRenderDirection()) { + case 2: + zMin = 0.625F; + zMax = 1.0F; + break; + case 3: + zMax = 0.375F; + zMin = 0F; + break; + case 4: + xMin = 0.625F; + xMax = 1.0F; + break; + case 5: + xMax = 0.375F; + xMin = 0F; + break; } - return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625, (double) ((float) z + zMax)); + return AxisAlignedBB.getBoundingBox( + (double) ((float) x + xMin), + (double) y + 0.25, + (double) ((float) z + zMin), + (double) ((float) x + xMax), + (double) y + 0.625, + (double) ((float) z + zMax)); } } @@ -276,23 +245,19 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, /* Redstone */ @Override - public boolean canConnectRedstone (IBlockAccess world, int x, int y, int z, int side) - { + public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) { return world.getBlockMetadata(x, y, z) == 1; } @Override - public void onNeighborBlockChange (World world, int x, int y, int z, Block neighborBlockID) - { - if (world.getBlockMetadata(x, y, z) == 1) - { + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighborBlockID) { + if (world.getBlockMetadata(x, y, z) == 1) { boolean isPowered = world.isBlockIndirectlyGettingPowered(x, y, z); TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof FaucetLogic)) - return; + if (!(te instanceof FaucetLogic)) return; FaucetLogic logic = (FaucetLogic) te; // was it a low->high pulse - if(!logic.hasRedstonePower && isPowered) { + if (!logic.hasRedstonePower && isPowered) { logic.hasRedstonePower = true; logic.setActive(true); } @@ -303,18 +268,16 @@ public void onNeighborBlockChange (World world, int x, int y, int z, Block neigh } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { - switch (metadata) - { - case 0: - return new CastingTableLogic(); - case 1: - return new FaucetLogic(); - case 2: - return new CastingBasinLogic(); - default: - return null; + public TileEntity createNewTileEntity(World world, int metadata) { + switch (metadata) { + case 0: + return new CastingTableLogic(); + case 1: + return new FaucetLogic(); + case 2: + return new CastingBasinLogic(); + default: + return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index ff7146b38cd..f0e575f5bb9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -11,10 +11,8 @@ import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -public class SearedSlab extends SlabBase -{ - public SearedSlab() - { +public class SearedSlab extends SlabBase { + public SearedSlab() { super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(12F); @@ -22,29 +20,22 @@ public SearedSlab() @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { - } + public void registerBlockIcons(IIconRegister iconRegister) {} @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { meta = meta % 8; - if (meta == 0) - return TinkerSmeltery.smeltery.getIcon(side, 2); - if (meta <= 3) - return TinkerSmeltery.smeltery.getIcon(side, meta + 3); + if (meta == 0) return TinkerSmeltery.smeltery.getIcon(side, 2); + if (meta <= 3) return TinkerSmeltery.smeltery.getIcon(side, meta + 3); return TinkerSmeltery.smeltery.getIcon(side, meta + 4); } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 8; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 8; iter++) { list.add(new ItemStack(id, 1, iter)); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index cc2924baefc..415dc407448 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -19,15 +19,12 @@ import tconstruct.smeltery.SmelteryProxyCommon; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.SmelteryRender; -import tconstruct.util.config.PHConstruct; -public class SmelteryBlock extends InventoryBlock -{ +public class SmelteryBlock extends InventoryBlock { Random rand; String texturePrefix = ""; - public SmelteryBlock() - { + public SmelteryBlock() { super(Material.rock); setHardness(3F); setResistance(20F); @@ -37,8 +34,7 @@ public SmelteryBlock() this.setBlockName("tconstruct.Smeltery"); } - public SmelteryBlock(String prefix) - { + public SmelteryBlock(String prefix) { this(); texturePrefix = prefix; } @@ -46,46 +42,51 @@ public SmelteryBlock(String prefix) /* Rendering */ @Override - public int getRenderType () - { + public int getRenderType() { return SmelteryRender.smelteryModel; } @Override - public String[] getTextureNames () - { - String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver", "searedbrickcracked", "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" }; + public String[] getTextureNames() { + String[] textureNames = { + "smeltery_side", + "smeltery_inactive", + "smeltery_active", + "drain_side", + "drain_out", + "drain_basin", + "searedbrick", + "searedstone", + "searedcobble", + "searedpaver", + "searedbrickcracked", + "searedroad", + "searedbrickfancy", + "searedbricksquare", + "searedcreeper" + }; if (!texturePrefix.equals("")) - for (int i = 0; i < textureNames.length; i++) - textureNames[i] = texturePrefix + "_" + textureNames[i]; + for (int i = 0; i < textureNames.length; i++) textureNames[i] = texturePrefix + "_" + textureNames[i]; return textureNames; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta < 2) - { + public IIcon getIcon(int side, int meta) { + if (meta < 2) { int sideTex = side == 3 ? 1 : 0; return icons[sideTex + meta * 3]; - } - else if (meta == 2) - { + } else if (meta == 2) { return icons[6]; - } - else if (meta == 11) - { - if (side == 0 || side == 1) - return icons[9]; + } else if (meta == 11) { + if (side == 0 || side == 1) return icons[9]; } return icons[3 + meta]; @@ -93,160 +94,128 @@ else if (meta == 11) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) - { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z); if (meta == 0) // Smeltery { - if (side == direction) - { - if (isActive(world, x, y, z)) - { + if (side == direction) { + if (isActive(world, x, y, z)) { return icons[2]; - } - else - { + } else { return icons[1]; } - } - else - { + } else { return icons[0]; } } if (meta == 1) // Drain { - if (side == direction) - return icons[5]; - else if (side / 2 == direction / 2) - return icons[4]; - else - return icons[3]; - } - else if (meta == 2) - { + if (side == direction) return icons[5]; + else if (side / 2 == direction / 2) return icons[4]; + else return icons[3]; + } else if (meta == 2) { return icons[6]; - } - else if (meta == 11) - { - if (side == 0 || side == 1) - return icons[9]; + } else if (meta == 11) { + if (side == 0 || side == 1) return icons[9]; } return icons[3 + meta]; - } - /* * @Override public int getRenderBlockPass() { return 1; } */ @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { return meta; } @Override - public int quantityDropped (Random random) - { + public int quantityDropped(Random random) { return 1; } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { // return -1; return SmelteryProxyCommon.smelteryGuiID; } @Override - public void randomDisplayTick (World world, int x, int y, int z, Random random) - { - if (isActive(world, x, y, z)) - { + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + if (isActive(world, x, y, z)) { TileEntity logic = world.getTileEntity(x, y, z); byte face = 0; - if (logic instanceof IFacingLogic) - face = ((IFacingLogic) logic).getRenderDirection(); + if (logic instanceof IFacingLogic) face = ((IFacingLogic) logic).getRenderDirection(); float f = (float) x + 0.5F; float f1 = (float) y + 0.5F + (random.nextFloat() * 6F) / 16F; float f2 = (float) z + 0.5F; float f3 = 0.52F; float f4 = random.nextFloat() * 0.6F - 0.3F; - switch (face) - { - case 4: - world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - break; - - case 5: - world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - break; - - case 2: - world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - break; - - case 3: - world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - break; + switch (face) { + case 4: + world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + break; + + case 5: + world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); + break; + + case 2: + world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); + break; + + case 3: + world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + break; } } } @Override - public int getLightValue (IBlockAccess world, int x, int y, int z) - { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return !isActive(world, x, y, z) ? 0 : 9; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) - { - if (world.getBlockMetadata(x, y, z) != 0) - return false; + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { + if (world.getBlockMetadata(x, y, z) != 0) return false; - return super.onBlockActivated(world, x,y,z, player, side, clickX, clickY, clickZ); + return super.onBlockActivated(world, x, y, z, player, side, clickX, clickY, clickZ); } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { - switch (metadata) - { - case 0: - return new SmelteryLogic(); - case 1: - return new SmelteryDrainLogic(); - case 3: - return null; // Furnace + public TileEntity createNewTileEntity(World world, int metadata) { + switch (metadata) { + case 0: + return new SmelteryLogic(); + case 1: + return new SmelteryDrainLogic(); + case 3: + return null; // Furnace } return new MultiServantLogic(); } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) - { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, entityliving, stack); - if (world.getBlockMetadata(x, y, z) == 0) - onBlockPlacedElsewhere(world, x, y, z, entityliving); + if (world.getBlockMetadata(x, y, z) == 0) onBlockPlacedElsewhere(world, x, y, z, entityliving); } - public void onBlockPlacedElsewhere (World world, int x, int y, int z, EntityLivingBase entityliving) - { + public void onBlockPlacedElsewhere(World world, int x, int y, int z, EntityLivingBase entityliving) { SmelteryLogic logic = (SmelteryLogic) world.getTileEntity(x, y, z); logic.checkValidPlacement(); } @@ -258,62 +227,49 @@ public void onBlockPlacedElsewhere (World world, int x, int y, int z, EntityLivi */ @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 12; iter++) - { - if (iter != 3) - list.add(new ItemStack(id, 1, iter)); + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 12; iter++) { + if (iter != 3) list.add(new ItemStack(id, 1, iter)); } } /* Updating */ @Override - public void onNeighborBlockChange (World world, int x, int y, int z, Block block) - { - //System.out.println("Neighbor changed"); + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + // System.out.println("Neighbor changed"); TileEntity logic = world.getTileEntity(x, y, z); - if (logic instanceof IServantLogic) - { + if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); - } - else if (logic instanceof IMasterLogic) - { + } else if (logic instanceof IMasterLogic) { ((IMasterLogic) logic).notifyChange(null, x, y, z); } } @Override - public void breakBlock (World world, int x, int y, int z, Block blockID, int meta) - { + public void breakBlock(World world, int x, int y, int z, Block blockID, int meta) { // TE is not valid anymore at this point. :/ TileEntity logic = world.getTileEntity(x, y, z); - if (logic instanceof IServantLogic) - { + if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); } super.breakBlock(world, x, y, z, blockID, meta); } - //Comparator + // Comparator - public boolean hasComparatorInputOverride () - { + public boolean hasComparatorInputOverride() { return true; } - public int getComparatorInputOverride (World world, int x, int y, int z, int comparatorSide) - { + public int getComparatorInputOverride(World world, int x, int y, int z, int comparatorSide) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 0) - { + if (meta == 0) { return Container.calcRedstoneFromInventory(((SmelteryLogic) world.getTileEntity(x, y, z))); } - if (meta == 1) - { + if (meta == 1) { return ((SmelteryDrainLogic) world.getTileEntity(x, y, z)).comparatorStrength(); } return 0; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index 9e8ea46c336..50e9413f3f7 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -9,48 +9,47 @@ import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; -public class SpeedBlock extends TConstructBlock -{ - public static String[] textureNames = new String[] { "brownstone_rough", "brownstone_rough_road", "brownstone_smooth", "brownstone_smooth_brick", "brownstone_smooth_road", "brownstone_smooth_fancy", "brownstone_smooth_chiseled" }; +public class SpeedBlock extends TConstructBlock { + public static String[] textureNames = new String[] { + "brownstone_rough", + "brownstone_rough_road", + "brownstone_smooth", + "brownstone_smooth_brick", + "brownstone_smooth_road", + "brownstone_smooth_fancy", + "brownstone_smooth_chiseled" + }; - public SpeedBlock() - { + public SpeedBlock() { super(Material.rock, 3.0f, textureNames); // this.setBlockBounds(0f, 0f, 0f, 1.0f, 0.5f, 1.0f); } @Override - public void onEntityWalking (World world, int x, int y, int z, Entity entity) - { + public void onEntityWalking(World world, int x, int y, int z, Entity entity) { double boost = 2.2D; int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 1 || metadata == 4) - boost = 2.7D; + if (metadata == 1 || metadata == 4) boost = 2.7D; double mX = Math.abs(entity.motionX); double mZ = Math.abs(entity.motionZ); - if (mX < 0.5D) - { + if (mX < 0.5D) { entity.motionX *= boost; } - if (mZ < 0.5D) - { + if (mZ < 0.5D) { entity.motionZ *= boost; } } @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { return meta; } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < textureNames.length; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < textureNames.length; iter++) { list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index 9611c850967..8ac17402624 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -13,10 +13,8 @@ import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -public class SpeedSlab extends SlabBase -{ - public SpeedSlab() - { +public class SpeedSlab extends SlabBase { + public SpeedSlab() { super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(3F); @@ -24,43 +22,34 @@ public SpeedSlab() @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { - } + public void registerBlockIcons(IIconRegister iconRegister) {} @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { meta = meta % 8; return TinkerSmeltery.speedBlock.getIcon(side, meta); } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 7; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < 7; iter++) { list.add(new ItemStack(b, 1, iter)); } } @Override - public void onEntityWalking (World world, int x, int y, int z, Entity entity) - { + public void onEntityWalking(World world, int x, int y, int z, Entity entity) { double boost = 2.2D; int metadata = world.getBlockMetadata(x, y, z) % 8; - if (metadata == 1 || metadata == 4) - boost = 2.7D; + if (metadata == 1 || metadata == 4) boost = 2.7D; double mX = Math.abs(entity.motionX); double mZ = Math.abs(entity.motionZ); - if (mX < 0.5D) - { + if (mX < 0.5D) { entity.motionX *= boost; } - if (mZ < 0.5D) - { + if (mZ < 0.5D) { entity.motionZ *= boost; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index 94e9ea714ed..5604ca27932 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -7,8 +7,7 @@ import net.minecraftforge.fluids.*; import tconstruct.library.TConstructRegistry; -public class TConstructFluid extends BlockFluidClassic -{ +public class TConstructFluid extends BlockFluidClassic { String texture; boolean alpha; public IIcon stillIcon; @@ -16,53 +15,44 @@ public class TConstructFluid extends BlockFluidClassic boolean overwriteFluidIcons = true; private Fluid fluid = null; - public TConstructFluid(Fluid fluid, Material material, String texture) - { + public TConstructFluid(Fluid fluid, Material material, String texture) { super(fluid, material); this.texture = texture; this.setCreativeTab(TConstructRegistry.blockTab); } - public TConstructFluid(Fluid fluid, Material material, String texture, boolean alpha) - { + public TConstructFluid(Fluid fluid, Material material, String texture, boolean alpha) { this(fluid, material, texture); this.alpha = alpha; } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return alpha ? 1 : 0; } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:" + texture); flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow"); - if (overwriteFluidIcons) - this.getFluid().setIcons(stillIcon, flowIcon); + if (overwriteFluidIcons) this.getFluid().setIcons(stillIcon, flowIcon); - if(this.getFluid().getBlock() != this && fluid != null) - fluid.setIcons(stillIcon, flowIcon); + if (this.getFluid().getBlock() != this && fluid != null) fluid.setIcons(stillIcon, flowIcon); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (side == 0 || side == 1) - return stillIcon; + public IIcon getIcon(int side, int meta) { + if (side == 0 || side == 1) return stillIcon; return flowIcon; } - public void suppressOverwritingFluidIcons () - { + public void suppressOverwritingFluidIcons() { overwriteFluidIcons = false; } public void setFluid(Fluid fluid) { this.fluid = fluid; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java b/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java index 1349fb87175..183e631d9ac 100644 --- a/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java +++ b/src/main/java/tconstruct/smeltery/gui/ActiveContainerGui.java @@ -5,31 +5,24 @@ import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.smeltery.inventory.ActiveSlot; -public abstract class ActiveContainerGui extends GuiContainer -{ +public abstract class ActiveContainerGui extends GuiContainer { - public ActiveContainerGui(ActiveContainer p_i1072_1_) - { + public ActiveContainerGui(ActiveContainer p_i1072_1_) { super(p_i1072_1_); } @Override - public void func_146977_a (Slot slot) - { - if (!(slot instanceof ActiveSlot) || ((ActiveSlot) slot).getActive()) - { + public void func_146977_a(Slot slot) { + if (!(slot instanceof ActiveSlot) || ((ActiveSlot) slot).getActive()) { super.func_146977_a(slot); } } @Override - public boolean isMouseOverSlot (Slot slot, int mouseX, int mouseY) - { - if (!(slot instanceof ActiveSlot) || ((ActiveSlot) slot).getActive()) - { + public boolean isMouseOverSlot(Slot slot, int mouseX, int mouseY) { + if (!(slot instanceof ActiveSlot) || ((ActiveSlot) slot).getActive()) { return super.isMouseOverSlot(slot, mouseX, mouseY); } return false; } - } diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index c038209ce41..9912e8fd8f2 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.gui; import java.util.*; - import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; @@ -9,17 +8,14 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.input.Mouse; import org.lwjgl.opengl.*; - import tconstruct.TConstruct; import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.SmelteryPacket; -public class SmelteryGui extends ActiveContainerGui -{ +public class SmelteryGui extends ActiveContainerGui { public SmelteryLogic logic; private boolean isScrolling = false; private boolean wasClicking; @@ -31,8 +27,7 @@ public class SmelteryGui extends ActiveContainerGui private final int smelterySize; public static final int maxRows = 8; - public SmelteryGui(InventoryPlayer inventoryplayer, SmelteryLogic smeltery, World world, int x, int y, int z) - { + public SmelteryGui(InventoryPlayer inventoryplayer, SmelteryLogic smeltery, World world, int x, int y, int z) { super((ActiveContainer) smeltery.getGuiContainer(inventoryplayer, world, x, y, z)); logic = smeltery; smelterySize = smeltery.getBlockCapacity(); @@ -43,20 +38,17 @@ public SmelteryGui(InventoryPlayer inventoryplayer, SmelteryLogic smeltery, Worl } @Override - public void initGui () - { + public void initGui() { super.initGui(); - if (logic != null) - logic.updateFuelDisplay(); + if (logic != null) logic.updateFuelDisplay(); } @Override - public void drawScreen (int mouseX, int mouseY, float par3) - { - // the smeltery changed. we close the screen because updating the changes in all containers would be way too complicated. - if(logic.getBlockCapacity() != smelterySize) - { + public void drawScreen(int mouseX, int mouseY, float par3) { + // the smeltery changed. we close the screen because updating the changes in all containers would be way too + // complicated. + if (logic.getBlockCapacity() != smelterySize) { mc.thePlayer.closeScreen(); return; } @@ -65,10 +57,8 @@ public void drawScreen (int mouseX, int mouseY, float par3) updateScrollbar(mouseX, mouseY, par3); } - protected void updateScrollbar (int mouseX, int mouseY, float par3) - { - if (smelterySize > columns * maxRows) - { + protected void updateScrollbar(int mouseX, int mouseY, float par3) { + if (smelterySize > columns * maxRows) { boolean mouseDown = Mouse.isButtonDown(0); int lefto = this.guiLeft; int topo = this.guiTop; @@ -77,88 +67,82 @@ protected void updateScrollbar (int mouseX, int mouseY, float par3) int scrollWidth = xScroll + 14; int scrollHeight = yScroll + 144; - if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollWidth && mouseY < scrollHeight) - { + if (!this.wasClicking + && mouseDown + && mouseX >= xScroll + && mouseY >= yScroll + && mouseX < scrollWidth + && mouseY < scrollHeight) { this.isScrolling = true; } - if (!mouseDown) - { + if (!mouseDown) { this.isScrolling = false; } - if (wasClicking && !isScrolling && slotPos != prevSlotPos) - { + if (wasClicking && !isScrolling && slotPos != prevSlotPos) { prevSlotPos = slotPos; } this.wasClicking = mouseDown; - if (this.isScrolling) - { + if (this.isScrolling) { this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollHeight - yScroll - 15.0F); - if (this.currentScroll < 0.0F) - { + if (this.currentScroll < 0.0F) { this.currentScroll = 0.0F; } - if (this.currentScroll > 1.0F) - { + if (this.currentScroll > 1.0F) { this.currentScroll = 1.0F; } int s = ((SmelteryContainer) this.inventorySlots).scrollTo(this.currentScroll); - if (s != -1) - slotPos = s; + if (s != -1) slotPos = s; } } } @Override - protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) - { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { int baseX = 86 + (columns - 3) * 22; fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Smeltery"), baseX, 5, 0x404040); - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), baseX + 4, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), baseX + 4, (ySize - 96) + 2, 0x404040); int cornerX = (width - xSize) / 2 + 36 + (columns - 3) * 22; int cornerY = (height - ySize) / 2; int[] fluidHeights = calcLiquidHeights(); int base = 0; - for (int i = 0; i < fluidHeights.length; i++) - { + for (int i = 0; i < fluidHeights.length; i++) { int leftX = cornerX + 54; int topY = (cornerY + 68) - fluidHeights[i] - base; - if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i]) - { + if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i]) { drawFluidStackTooltip(logic.moltenMetal.get(i), mouseX - cornerX + 36, mouseY - cornerY, false); } base += fluidHeights[i]; } // lava/fuel - if (logic.fuelGague > 0) - { + if (logic.fuelGague > 0) { int leftX = cornerX + 117; int topY = (cornerY + 68) - logic.getScaledFuelGague(52); int sizeX = 12; int sizeY = logic.getScaledFuelGague(52); - if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY) - { + if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY) { drawFluidStackTooltip(logic.getFuel(), mouseX - cornerX + 36, mouseY - cornerY, true); } } } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/smeltery.png"); - private static final ResourceLocation backgroundSide = new ResourceLocation("tinker", "textures/gui/smelteryside.png"); + private static final ResourceLocation backgroundSide = + new ResourceLocation("tinker", "textures/gui/smelteryside.png"); @Override - protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) - { + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2 + 36 + (columns - 3) * 22; @@ -167,44 +151,43 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) // Fuel - Lava this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); - if (logic.fuelGague > 0) - { + if (logic.fuelGague > 0) { FluidStack fuelStack = logic.getFuel(); IIcon lavaIcon = fuelStack.getFluid().getStillIcon(); - if(lavaIcon == null) - lavaIcon = Blocks.lava.getIcon(0, 0); + if (lavaIcon == null) lavaIcon = Blocks.lava.getIcon(0, 0); int fuel = logic.getScaledFuelGague(52); int count = 0; - while (fuel > 0) - { + while (fuel > 0) { int size = fuel >= 16 ? 16 : fuel; fuel -= size; - drawLiquidRect(cornerX + 117, (cornerY + 68) - size - 16 * count, lavaIcon, 12, size, fuelStack.getFluid().getColor(fuelStack)); + drawLiquidRect( + cornerX + 117, + (cornerY + 68) - size - 16 * count, + lavaIcon, + 12, + size, + fuelStack.getFluid().getColor(fuelStack)); count++; } } - if (logic.getCapacity() > 0) - { + if (logic.getCapacity() > 0) { // Liquids - molten metal int base = 0; int[] fluidHeights = calcLiquidHeights(); // render the fluids int basePos = 54; - for (int i = 0; i < logic.moltenMetal.size(); i++) - { + for (int i = 0; i < logic.moltenMetal.size(); i++) { FluidStack liquid = logic.moltenMetal.get(i); IIcon icon = liquid.getFluid().getStillIcon(); int color = liquid.getFluid().getColor(liquid); - if (icon == null) - continue; + if (icon == null) continue; int height = fluidHeights[i]; int h = height; - while (h > 0) - { + while (h > 0) { int v = Math.min(16, h); // we render in 16x16 squares so the texture doesn't get distorted drawLiquidRect(cornerX + basePos + 00, (cornerY + 68) - h - base, icon, 16, v, color); @@ -227,15 +210,12 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) int xleft = 46; xleft += 22 * (columns - 3); // we have to shift the whole thing to the left if we have more than 3 columns int h = smelterySize / columns; - if (smelterySize % columns != 0) - h++; + if (smelterySize % columns != 0) h++; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(backgroundSide); - if (smelterySize > 0) - { - if (h >= 8) - { + if (smelterySize > 0) { + if (h >= 8) { // standard 3 slots drawTexturedModalRect(cornerX - xleft, cornerY, 0, 0, 72, ySize - 8); // additional slots @@ -250,11 +230,8 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) if (isScrolling || (mouseX >= sx && mouseX <= sx + 12 && mouseY >= sy && mouseY <= sy + 15)) drawTexturedModalRect(sx, sy, 122, 0, 12, 15); // scroll bar - else - drawTexturedModalRect(sx, sy, 98, 0, 12, 15); - } - else - { + else drawTexturedModalRect(sx, sy, 98, 0, 12, 15); + } else { int yd = 43 + 18 * (h - 3); // slots // standard 3 slots @@ -279,36 +256,41 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) xleft -= 8; // Temperature int slotSize = smelterySize; - if (slotSize > columns * maxRows) - slotSize = columns * maxRows; + if (slotSize > columns * maxRows) slotSize = columns * maxRows; int iter; - for (iter = 0; iter < slotSize && iter + slotPos * columns < smelterySize; iter++) - { + for (iter = 0; iter < slotSize && iter + slotPos * columns < smelterySize; iter++) { int slotTemp = logic.getTempForSlot(iter + slotPos * columns) - 20; int maxTemp = logic.getMeltingPointForSlot(iter + slotPos * columns) - 20; - if (slotTemp > 0 && maxTemp > 0) - { + if (slotTemp > 0 && maxTemp > 0) { int size = 16 * slotTemp / maxTemp + 1; - drawTexturedModalRect(cornerX - xleft + (iter % columns * 22), cornerY + 8 + (iter / columns * 18) + 16 - size, 98, 15 + 16 - size, 5, size); + drawTexturedModalRect( + cornerX - xleft + (iter % columns * 22), + cornerY + 8 + (iter / columns * 18) + 16 - size, + 98, + 15 + 16 - size, + 5, + size); } } // hide nonexistant slots int maxSlots = Math.min(maxRows, h) * columns; - for (; iter < maxSlots; iter++) - { - drawTexturedModalRect(cornerX - xleft + (iter % columns * 22) - 1, cornerY + 8 + (iter / columns * 18) - 1, 98, 47, 22, 18); + for (; iter < maxSlots; iter++) { + drawTexturedModalRect( + cornerX - xleft + (iter % columns * 22) - 1, + cornerY + 8 + (iter / columns * 18) - 1, + 98, + 47, + 22, + 18); } } - protected int[] calcLiquidHeights () - { + protected int[] calcLiquidHeights() { int fluidHeights[] = new int[logic.moltenMetal.size()]; int cap = logic.getCapacity(); - if (logic.getTotalLiquid() > cap) - cap = logic.getTotalLiquid(); - for (int i = 0; i < logic.moltenMetal.size(); i++) - { + if (logic.getTotalLiquid() > cap) cap = logic.getTotalLiquid(); + for (int i = 0; i < logic.moltenMetal.size(); i++) { FluidStack liquid = logic.moltenMetal.get(i); float h = (float) liquid.amount / (float) cap; @@ -317,36 +299,30 @@ protected int[] calcLiquidHeights () // check if we have enough height to render everything int sum = 0; - do - { + do { sum = 0; int biggest = -1; int m = 0; - for (int i = 0; i < fluidHeights.length; i++) - { + for (int i = 0; i < fluidHeights.length; i++) { sum += fluidHeights[i]; - if (logic.moltenMetal.get(i).amount > biggest) - { + if (logic.moltenMetal.get(i).amount > biggest) { biggest = logic.moltenMetal.get(i).amount; m = i; } } // remove a pixel from the biggest one - if (sum > 52) - fluidHeights[m]--; + if (sum > 52) fluidHeights[m]--; } while (sum > 52); return fluidHeights; } - protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int par3, boolean fuel) - { + protected void drawFluidStackTooltip(FluidStack par1ItemStack, int par2, int par3, boolean fuel) { this.zLevel = 100; List list = getLiquidTooltip(par1ItemStack, this.mc.gameSettings.advancedItemTooltips, fuel); - for (int k = 0; k < list.size(); ++k) - { + for (int k = 0; k < list.size(); ++k) { list.set(k, EnumChatFormatting.GRAY + (String) list.get(k)); } @@ -354,83 +330,56 @@ protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int pa this.zLevel = 0; } - public List getLiquidTooltip (FluidStack liquid, boolean advanced, boolean fuel) - { + public List getLiquidTooltip(FluidStack liquid, boolean advanced, boolean fuel) { ArrayList list = new ArrayList(); - if (fuel) - { + if (fuel) { list.add("\u00A7f" + StatCollector.translateToLocal("gui.smeltery.fuel")); list.add("mB: " + liquid.amount); - } - else - { + } else { String name = liquid.getFluid().getLocalizedName(liquid); list.add("\u00A7f" + name); - if (name.equals(StatCollector.translateToLocal("fluid.emerald.liquid"))) - { + if (name.equals(StatCollector.translateToLocal("fluid.emerald.liquid"))) { list.add(StatCollector.translateToLocal("gui.smeltery.emerald") + liquid.amount / 640f); - } - else if (name.equals(StatCollector.translateToLocal("fluid.quartz.molten"))) - { + } else if (name.equals(StatCollector.translateToLocal("fluid.quartz.molten"))) { list.add(StatCollector.translateToLocal("gui.smeltery.quartz") + liquid.amount / 250f); - } - else if (name.equals(StatCollector.translateToLocal("fluid.glass.molten"))) - { + } else if (name.equals(StatCollector.translateToLocal("fluid.glass.molten"))) { int blocks = liquid.amount / 1000; - if (blocks > 0) - list.add(StatCollector.translateToLocal("gui.smeltery.glass.block") + blocks); + if (blocks > 0) list.add(StatCollector.translateToLocal("gui.smeltery.glass.block") + blocks); int panels = (liquid.amount % 1000) / 250; - if (panels > 0) - list.add(StatCollector.translateToLocal("gui.smeltery.glass.pannel") + panels); + if (panels > 0) list.add(StatCollector.translateToLocal("gui.smeltery.glass.pannel") + panels); int mB = (liquid.amount % 1000) % 250; - if (mB > 0) - list.add("mB: " + mB); - } - else if (name.equals(StatCollector.translateToLocal("fluid.stone.seared"))) - { + if (mB > 0) list.add("mB: " + mB); + } else if (name.equals(StatCollector.translateToLocal("fluid.stone.seared"))) { int blocks = liquid.amount / TConstruct.ingotLiquidValue; - if (blocks > 0) - list.add(StatCollector.translateToLocal("gui.smeltery.glass.block") + blocks); - int ingots = (liquid.amount % TConstruct.ingotLiquidValue) / (TConstruct.ingotLiquidValue/4); - if (ingots > 0) - list.add(StatCollector.translateToLocal("gui.smeltery.metal.ingot") + ingots); - int mB = (liquid.amount % TConstruct.ingotLiquidValue) % (TConstruct.ingotLiquidValue/4); - if (mB > 0) - list.add("mB: " + mB); - } - else if (isMolten(name)) - { + if (blocks > 0) list.add(StatCollector.translateToLocal("gui.smeltery.glass.block") + blocks); + int ingots = (liquid.amount % TConstruct.ingotLiquidValue) / (TConstruct.ingotLiquidValue / 4); + if (ingots > 0) list.add(StatCollector.translateToLocal("gui.smeltery.metal.ingot") + ingots); + int mB = (liquid.amount % TConstruct.ingotLiquidValue) % (TConstruct.ingotLiquidValue / 4); + if (mB > 0) list.add("mB: " + mB); + } else if (isMolten(name)) { int ingots = liquid.amount / TConstruct.ingotLiquidValue; - if (ingots > 0) - list.add(StatCollector.translateToLocal("gui.smeltery.metal.ingot") + ingots); + if (ingots > 0) list.add(StatCollector.translateToLocal("gui.smeltery.metal.ingot") + ingots); int mB = liquid.amount % TConstruct.ingotLiquidValue; - if (mB > 0) - { + if (mB > 0) { int nuggets = mB / TConstruct.nuggetLiquidValue; int junk = (mB % TConstruct.nuggetLiquidValue); - if (nuggets > 0) - list.add(StatCollector.translateToLocal("gui.smeltery.metal.nugget") + nuggets); - if (junk > 0) - list.add("mB: " + junk); + if (nuggets > 0) list.add(StatCollector.translateToLocal("gui.smeltery.metal.nugget") + nuggets); + if (junk > 0) list.add("mB: " + junk); } - } - else - { + } else { list.add("mB: " + liquid.amount); } } return list; } - private boolean isMolten (String fluidName) - { + private boolean isMolten(String fluidName) { boolean molten = false; - String[] moltenNames = StatCollector.translateToLocal("gui.smeltery.molten.check").split(","); + String[] moltenNames = + StatCollector.translateToLocal("gui.smeltery.molten.check").split(","); - for (int i = 0; i < moltenNames.length; i++) - { - if (fluidName.contains(moltenNames[i].trim())) - { + for (int i = 0; i < moltenNames.length; i++) { + if (fluidName.contains(moltenNames[i].trim())) { molten = true; break; } @@ -439,10 +388,8 @@ private boolean isMolten (String fluidName) return molten; } - protected void drawToolTip (List par1List, int par2, int par3) - { - if (!par1List.isEmpty()) - { + protected void drawToolTip(List par1List, int par2, int par3) { + if (!par1List.isEmpty()) { GL11.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_LIGHTING); @@ -450,13 +397,11 @@ protected void drawToolTip (List par1List, int par2, int par3) int k = 0; Iterator iterator = par1List.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { String s = (String) iterator.next(); int l = this.fontRendererObj.getStringWidth(s); - if (l > k) - { + if (l > k) { k = l; } } @@ -465,18 +410,15 @@ protected void drawToolTip (List par1List, int par2, int par3) int j1 = par3 - 12; int k1 = 8; - if (par1List.size() > 1) - { + if (par1List.size() > 1) { k1 += 2 + (par1List.size() - 1) * 10; } - if (i1 + k > this.width) - { + if (i1 + k > this.width) { i1 -= 28 + k; } - if (j1 + k1 + 6 > this.height) - { + if (j1 + k1 + 6 > this.height) { j1 = this.height - k1 - 6; } @@ -495,13 +437,11 @@ protected void drawToolTip (List par1List, int par2, int par3) this.drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 - 3 + 1, i2, i2); this.drawGradientRect(i1 - 3, j1 + k1 + 2, i1 + k + 3, j1 + k1 + 3, j2, j2); - for (int k2 = 0; k2 < par1List.size(); ++k2) - { + for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String) par1List.get(k2); this.fontRendererObj.drawStringWithShadow(s1, i1, j1, -1); - if (k2 == 0) - { + if (k2 == 0) { j1 += 2; } @@ -514,8 +454,7 @@ protected void drawToolTip (List par1List, int par2, int par3) } } - public void drawLiquidRect (int startU, int startV, IIcon icon, int endU, int endV, int color) - { + public void drawLiquidRect(int startU, int startV, IIcon icon, int endU, int endV, int color) { float top = icon.getInterpolatedV(16 - endV); float bottom = icon.getMaxV(); float left = icon.getMinU(); @@ -523,16 +462,15 @@ public void drawLiquidRect (int startU, int startV, IIcon icon, int endU, int en Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setColorOpaque_I(color); - tessellator.addVertexWithUV(startU + 0, startV + endV, this.zLevel, left, bottom);//Bottom left - tessellator.addVertexWithUV(startU + endU, startV + endV, this.zLevel, right, bottom);//Bottom right - tessellator.addVertexWithUV(startU + endU, startV + 0, this.zLevel, right, top);//Top right - tessellator.addVertexWithUV(startU + 0, startV + 0, this.zLevel, left, top); //Top left + tessellator.addVertexWithUV(startU + 0, startV + endV, this.zLevel, left, bottom); // Bottom left + tessellator.addVertexWithUV(startU + endU, startV + endV, this.zLevel, right, bottom); // Bottom right + tessellator.addVertexWithUV(startU + endU, startV + 0, this.zLevel, right, top); // Top right + tessellator.addVertexWithUV(startU + 0, startV + 0, this.zLevel, left, top); // Top left tessellator.draw(); } @Override - public void mouseClicked (int mouseX, int mouseY, int mouseButton) - { + public void mouseClicked(int mouseX, int mouseY, int mouseButton) { super.mouseClicked(mouseX, mouseY, mouseButton); int cornerX = (width - xSize) / 2 + 36 + (columns - 3) * 22; @@ -541,16 +479,20 @@ public void mouseClicked (int mouseX, int mouseY, int mouseButton) int[] fluidHeights = calcLiquidHeights(); int base = 0; - for(int i = 0; i < fluidHeights.length; i++) - { + for (int i = 0; i < fluidHeights.length; i++) { int leftX = cornerX + 54; int topY = (cornerY + 68) - fluidHeights[i] - base; - if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i]) - { + if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i]) { fluidToBeBroughtUp = logic.moltenMetal.get(i).getFluidID(); - TConstruct.packetPipeline.sendToServer(new SmelteryPacket(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp)); + TConstruct.packetPipeline.sendToServer(new SmelteryPacket( + logic.getWorldObj().provider.dimensionId, + logic.xCoord, + logic.yCoord, + logic.zCoord, + this.isShiftKeyDown(), + fluidToBeBroughtUp)); } base += fluidHeights[i]; } diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java index ae3e1b65cdc..82492ff85d8 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java @@ -4,22 +4,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -public class ActiveContainer extends Container -{ +public class ActiveContainer extends Container { public List activeInventorySlots = new ArrayList(); @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { return false; } - protected ActiveSlot addDualSlotToContainer (ActiveSlot slot) - { + protected ActiveSlot addDualSlotToContainer(ActiveSlot slot) { slot.activeSlotNumber = this.activeInventorySlots.size(); this.activeInventorySlots.add(slot); this.addSlotToContainer(slot); return slot; } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java index 9dd68115c9d..b1faa955de2 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java @@ -2,24 +2,20 @@ import net.minecraft.inventory.*; -public class ActiveSlot extends Slot -{ +public class ActiveSlot extends Slot { protected boolean active; public int activeSlotNumber; - public ActiveSlot(IInventory iinventory, int par2, int par3, int par4, boolean flag) - { + public ActiveSlot(IInventory iinventory, int par2, int par3, int par4, boolean flag) { super(iinventory, par2, par3, par4); active = flag; } - public void setActive (boolean flag) - { + public void setActive(boolean flag) { active = flag; } - public boolean getActive () - { + public boolean getActive() { return active; } } diff --git a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java index e26fec83c53..6f7110c77ee 100644 --- a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java @@ -8,8 +8,7 @@ import tconstruct.smeltery.gui.SmelteryGui; import tconstruct.smeltery.logic.SmelteryLogic; -public class SmelteryContainer extends ActiveContainer -{ +public class SmelteryContainer extends ActiveContainer { public SmelteryLogic logic; public InventoryPlayer playerInv; public int fuel = 0; @@ -17,8 +16,7 @@ public class SmelteryContainer extends ActiveContainer public int columns; public final int smelterySize; - public SmelteryContainer(InventoryPlayer inventoryplayer, SmelteryLogic smeltery) - { + public SmelteryContainer(InventoryPlayer inventoryplayer, SmelteryLogic smeltery) { logic = smeltery; playerInv = inventoryplayer; slotRow = 0; @@ -31,47 +29,38 @@ public SmelteryContainer(InventoryPlayer inventoryplayer, SmelteryLogic smeltery int totalSlots = smeltery.getBlockCapacity(); int y = 0; - for (int i = 0; i < totalSlots; i++) - { + for (int i = 0; i < totalSlots; i++) { int x = i % columns; this.addDualSlotToContainer(new ActiveSlot(smeltery, x + y * columns, 2 + x * 22, 8 + y * 18, y < 8)); - if (x == columns - 1) - y++; + if (x == columns - 1) y++; } - + int baseX = 90 + (columns - 3) * 22; /* Player inventory */ - for (int row = 0; row < 3; row++) - { - for (int column = 0; column < 9; column++) - { - this.addSlotToContainer(new Slot(inventoryplayer, column + row * 9 + 9, baseX + column * 18, 84 + row * 18)); + for (int row = 0; row < 3; row++) { + for (int column = 0; column < 9; column++) { + this.addSlotToContainer( + new Slot(inventoryplayer, column + row * 9 + 9, baseX + column * 18, 84 + row * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, baseX + column * 18, 142)); } } - public int updateRows (int invRow) - { - if (invRow != slotRow) - { + public int updateRows(int invRow) { + if (invRow != slotRow) { slotRow = invRow; // TConstruct.logger.info(invRow); int basePos = invRow * columns; - for (int iter = 0; iter < activeInventorySlots.size(); iter++) - { + for (int iter = 0; iter < activeInventorySlots.size(); iter++) { ActiveSlot slot = (ActiveSlot) activeInventorySlots.get(iter); - if (slot.activeSlotNumber >= basePos && slot.activeSlotNumber < basePos + columns * SmelteryGui.maxRows) - { + if (slot.activeSlotNumber >= basePos + && slot.activeSlotNumber < basePos + columns * SmelteryGui.maxRows) { slot.setActive(true); - } - else - { + } else { slot.setActive(false); } @@ -85,22 +74,20 @@ public int updateRows (int invRow) return -1; } - public int scrollTo (float scrollPos) - { + public int scrollTo(float scrollPos) { int slots = SmelteryGui.maxRows * columns; float total = (logic.getSizeInventory() - slots) / columns; - if ((logic.getSizeInventory() - slots) % columns != 0) - total++; + if ((logic.getSizeInventory() - slots) % columns != 0) total++; int rowPos = Math.round(total * scrollPos); return updateRows(rowPos); } @Override - public void detectAndSendChanges () // TODO: Sync with this - { - // we only update if the size is the same, since the screen is getting closed on sizechange and would cause a crash otherwise - if(smelterySize == this.inventorySlots.size()) - super.detectAndSendChanges(); + public void detectAndSendChanges() // TODO: Sync with this + { + // we only update if the size is the same, since the screen is getting closed on sizechange and would cause a + // crash otherwise + if (smelterySize == this.inventorySlots.size()) super.detectAndSendChanges(); /* * for (int i = 0; i < crafters.size(); i++) { ICrafting icrafting = * (ICrafting)crafters.get(i); if (progress != logic.progress) { @@ -108,17 +95,15 @@ public void detectAndSendChanges () // TODO: Sync with this * != logic.fuel) { icrafting.sendProgressBarUpdate(this, 1, * logic.fuel); } if (fuelGague != logic.fuelGague) { * icrafting.sendProgressBarUpdate(this, 2, logic.fuelGague); } } - * + * * progress = logic.progress; fuel = logic.fuel; fuelGague = * logic.fuelGague; */ } @Override - public void updateProgressBar (int id, int value) - { - if (id == 0) - { + public void updateProgressBar(int id, int value) { + if (id == 0) { logic.fuelGague = value; } /* @@ -130,43 +115,32 @@ public void updateProgressBar (int id, int value) } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerSmeltery.smeltery && block != TinkerSmeltery.smelteryNether) - return false; + if (block != TinkerSmeltery.smeltery && block != TinkerSmeltery.smelteryNether) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < smelterySize) - { - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { + if (slotID < smelterySize) { + if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(slotStack, 0, smelterySize, false)) - { + } else if (!this.mergeItemStack(slotStack, 0, smelterySize, false)) { return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } @@ -175,14 +149,12 @@ else if (!this.mergeItemStack(slotStack, 0, smelterySize, false)) } @Override - protected boolean mergeItemStack (ItemStack inputStack, int startSlot, int endSlot, boolean flag) - { + protected boolean mergeItemStack(ItemStack inputStack, int startSlot, int endSlot, boolean flag) { // TConstruct.logger.info("Merge"); boolean merged = false; int slotPos = startSlot; - if (flag) - { + if (flag) { slotPos = endSlot - 1; } @@ -195,11 +167,11 @@ protected boolean mergeItemStack (ItemStack inputStack, int startSlot, int endSl * (inputStack.stackSize > 0 && (!flag && slotPos < endSlot || flag && * slotPos >= startSlot)) { slot = (Slot) * this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - * + * * if (slotStack != null && ItemStack.areItemStacksEqual(inputStack, * slotStack) && !inputStack.getHasSubtypes()) { int totalSize = * slotStack.stackSize + inputStack.stackSize; - * + * * if (totalSize <= inputStack.getMaxStackSize()) { inputStack.stackSize * = 0; slotStack.stackSize = totalSize; slot.onSlotChanged(); merged = * true; } else if (slotStack.stackSize < inputStack.getMaxStackSize()) @@ -207,30 +179,26 @@ protected boolean mergeItemStack (ItemStack inputStack, int startSlot, int endSl * slotStack.stackSize; slotStack.stackSize = * inputStack.getMaxStackSize(); slot.onSlotChanged(); merged = true; } * } - * + * * if (flag) { --slotPos; } else { ++slotPos; } } } */ - if (inputStack.isStackable() && startSlot >= logic.getSizeInventory()) - { - while (inputStack.stackSize > 0 && (!flag && slotPos < endSlot || flag && slotPos >= startSlot)) - { + if (inputStack.isStackable() && startSlot >= logic.getSizeInventory()) { + while (inputStack.stackSize > 0 && (!flag && slotPos < endSlot || flag && slotPos >= startSlot)) { slot = (Slot) this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - if (slotStack != null && slotStack.isItemEqual(inputStack) && ItemStack.areItemStackTagsEqual(slotStack, inputStack)) - { + if (slotStack != null + && slotStack.isItemEqual(inputStack) + && ItemStack.areItemStackTagsEqual(slotStack, inputStack)) { int l = slotStack.stackSize + inputStack.stackSize; - if (l <= inputStack.getMaxStackSize()) - { + if (l <= inputStack.getMaxStackSize()) { inputStack.stackSize = 0; slotStack.stackSize = l; slot.onSlotChanged(); merged = true; - } - else if (slotStack.stackSize < inputStack.getMaxStackSize()) - { + } else if (slotStack.stackSize < inputStack.getMaxStackSize()) { inputStack.stackSize -= inputStack.getMaxStackSize() - slotStack.stackSize; slotStack.stackSize = inputStack.getMaxStackSize(); slot.onSlotChanged(); @@ -238,35 +206,26 @@ else if (slotStack.stackSize < inputStack.getMaxStackSize()) } } - if (flag) - { + if (flag) { --slotPos; - } - else - { + } else { ++slotPos; } } } - if (inputStack.stackSize > 0) - { - if (flag) - { + if (inputStack.stackSize > 0) { + if (flag) { slotPos = endSlot - 1; - } - else - { + } else { slotPos = startSlot; } - while (!flag && slotPos < endSlot || flag && slotPos >= startSlot) - { + while (!flag && slotPos < endSlot || flag && slotPos >= startSlot) { slot = (Slot) this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - if (slotStack == null) - { + if (slotStack == null) { slot.putStack(inputStack.copy()); slot.onSlotChanged(); inputStack.stackSize -= 1; @@ -274,12 +233,9 @@ else if (slotStack.stackSize < inputStack.getMaxStackSize()) break; } - if (flag) - { + if (flag) { --slotPos; - } - else - { + } else { ++slotPos; } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java index bd61d65a6a2..f51cb6d716a 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class CastingChannelItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "Channel" }; +public class CastingChannelItem extends MultiItemBlock { + public static final String blockTypes[] = {"Channel"}; - public CastingChannelItem(Block b) - { + public CastingChannelItem(Block b) { super(b, "Smeltery", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java index ff1273cc63a..614aec1f73f 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java @@ -7,57 +7,44 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class GlassBlockItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "pure" };// , "soul", - // "soul.pure" }; +public class GlassBlockItem extends MultiItemBlock { + public static final String blockTypes[] = {"pure"}; // , "soul", + // "soul.pure" }; - public GlassBlockItem(Block b) - { + public GlassBlockItem(Block b) { super(b, "block.glass", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.hasTagCompound() && stack.getItemDamage() == 0) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (stack.hasTagCompound() && stack.getItemDamage() == 0) { NBTTagCompound contentTags = stack.getTagCompound().getCompoundTag("Contents"); - if (contentTags != null) - { + if (contentTags != null) { ItemStack contents = ItemStack.loadItemStackFromNBT(contentTags); - if (contents != null) - { + if (contents != null) { list.add("Inventory: " + contents.getDisplayName()); list.add("Amount: " + contents.stackSize); } } NBTTagCompound camoTag = stack.getTagCompound().getCompoundTag("Camoflauge"); - if (camoTag != null) - { + if (camoTag != null) { ItemStack camo = ItemStack.loadItemStackFromNBT(camoTag); - if (camo != null) - list.add("Camoflauge: " + camo.getDisplayName()); + if (camo != null) list.add("Camoflauge: " + camo.getDisplayName()); } - if (stack.getTagCompound().hasKey("Placement")) - { + if (stack.getTagCompound().hasKey("Placement")) { String string = getDirectionString(stack.getTagCompound().getByte("Placement")); list.add("Placement Direction: " + string); } } } - String getDirectionString (byte key) - { - if (key == 0) - return ("Up"); - if (key == 1) - return ("Right"); - if (key == 2) - return ("Down"); + String getDirectionString(byte key) { + if (key == 0) return ("Up"); + if (key == 1) return ("Right"); + if (key == 2) return ("Down"); return "Left"; } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java index f2b1c97b0b7..50f76942ca1 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class GlassPaneItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "pure", "soul", "soul.pure" }; +public class GlassPaneItem extends MultiItemBlock { + public static final String blockTypes[] = {"pure", "soul", "soul.pure"}; - public GlassPaneItem(Block b) - { + public GlassPaneItem(Block b) { super(b, "block.glass", "pane", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java index d9aa8c7f1c7..ac71cf61b5c 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java @@ -1,5 +1,6 @@ package tconstruct.smeltery.itemblocks; +import java.util.List; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -10,33 +11,25 @@ import net.minecraftforge.fluids.IFluidContainerItem; import tconstruct.smeltery.logic.LavaTankLogic; -import java.util.List; - -public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainerItem -{ - public static final String blockTypes[] = { "Tank", "Gague", "Window" }; +public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainerItem { + public static final String blockTypes[] = {"Tank", "Gague", "Window"}; - public LavaTankItemBlock(Block b) - { + public LavaTankItemBlock(Block b) { super(b, "LavaTank", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.hasTagCompound()) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (stack.hasTagCompound()) { NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid"); - if (liquidTag != null) - { - list.add(StatCollector.translateToLocal("searedtank1.tooltip") + " " + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); + if (liquidTag != null) { + list.add(StatCollector.translateToLocal("searedtank1.tooltip") + " " + + StatCollector.translateToLocal(liquidTag.getString("FluidName"))); list.add(liquidTag.getInteger("Amount") + " mB"); } - } - else - { + } else { list.add(StatCollector.translateToLocal("searedtank3.tooltip")); list.add(StatCollector.translateToLocal("searedtank2.tooltip")); } @@ -79,7 +72,6 @@ public void setFluid(ItemStack container, FluidStack resource) { container.setTagCompound(nbt); } - /** * @param container * ItemStack which is the fluid container. diff --git a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java index b05fe80a1a0..8f3d63e52fd 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java @@ -7,20 +7,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -public class MetalItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" }; +public class MetalItemBlock extends MultiItemBlock { + public static final String blockTypes[] = { + "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" + }; - public MetalItemBlock(Block b) - { + public MetalItemBlock(Block b) { super(b, "StorageMetals", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add(StatCollector.translateToLocal("metalblock.tooltip")); } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java index cc9dbd4e397..5752e9a89a8 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java @@ -3,15 +3,13 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class SearedSlabItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "brick", "stone", "cobble", "paver", "road", "fancy", "square", "creeper" }; +public class SearedSlabItem extends MultiItemBlock { + public static final String blockTypes[] = {"brick", "stone", "cobble", "paver", "road", "fancy", "square", "creeper" + }; - public SearedSlabItem(Block b) - { + public SearedSlabItem(Block b) { super(b, "block.searedstone.slab", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java index 00a3c0af6e6..21ef2570a7a 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java @@ -1,19 +1,16 @@ package tconstruct.smeltery.itemblocks; +import java.util.List; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import java.util.List; - -public class SearedTableItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "Table", "Faucet", "Basin" }; +public class SearedTableItemBlock extends MultiItemBlock { + public static final String blockTypes[] = {"Table", "Faucet", "Basin"}; - public SearedTableItemBlock(Block b) - { + public SearedTableItemBlock(Block b) { super(b, "SearedBlock", blockTypes); setMaxDamage(0); setHasSubtypes(true); @@ -34,7 +31,6 @@ public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p break; } - if(StatCollector.canTranslate(tooltip)) - p_77624_3_.add(StatCollector.translateToLocal(tooltip)); + if (StatCollector.canTranslate(tooltip)) p_77624_3_.add(StatCollector.translateToLocal(tooltip)); } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java index 02845648d77..b6b9c2ee0b5 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java @@ -10,12 +10,22 @@ import net.minecraft.world.World; import tconstruct.achievements.TAchievements; -public class SmelteryItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "Controller", "Drain", "Brick", "Furnace", "Stone", "Cobblestone", "Paver", "Brick.Cracked", "Road", "Brick.Fancy", "Brick.Square" }; +public class SmelteryItemBlock extends MultiItemBlock { + public static final String blockTypes[] = { + "Controller", + "Drain", + "Brick", + "Furnace", + "Stone", + "Cobblestone", + "Paver", + "Brick.Cracked", + "Road", + "Brick.Fancy", + "Brick.Square" + }; - public SmelteryItemBlock(Block b) - { + public SmelteryItemBlock(Block b) { super(b, "Smeltery", blockTypes); setMaxDamage(0); setHasSubtypes(true); @@ -23,30 +33,27 @@ public SmelteryItemBlock(Block b) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 0: - list.add(StatCollector.translateToLocal("smeltery.controller.tooltip")); - break; - case 1: - list.add(StatCollector.translateToLocal("smeltery.drain.tooltip1")); - list.add(StatCollector.translateToLocal("smeltery.drain.tooltip2")); - break; - case 3: - list.add(StatCollector.translateToLocal("smeltery.furnace.tooltip")); - break; - default: - list.add(StatCollector.translateToLocal("smeltery.brick.tooltip1")); - list.add(StatCollector.translateToLocal("smeltery.brick.tooltip2")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 0: + list.add(StatCollector.translateToLocal("smeltery.controller.tooltip")); + break; + case 1: + list.add(StatCollector.translateToLocal("smeltery.drain.tooltip1")); + list.add(StatCollector.translateToLocal("smeltery.drain.tooltip2")); + break; + case 3: + list.add(StatCollector.translateToLocal("smeltery.furnace.tooltip")); + break; + default: + list.add(StatCollector.translateToLocal("smeltery.brick.tooltip1")); + list.add(StatCollector.translateToLocal("smeltery.brick.tooltip2")); + break; } } @Override - public void onCreated (ItemStack item, World world, EntityPlayer player) - { + public void onCreated(ItemStack item, World world, EntityPlayer player) { TAchievements.triggerAchievement(player, "tconstruct.smelteryMaker"); } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java index f1577702436..ed3579f873d 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java @@ -7,24 +7,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -public class SpeedBlockItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", "brownstone.smooth.chiseled" }; +public class SpeedBlockItem extends MultiItemBlock { + public static final String blockTypes[] = { + "brownstone.rough", + "brownstone.rough.road", + "brownstone.smooth", + "brownstone.smooth.brick", + "brownstone.smooth.road", + "brownstone.smooth.fancy", + "brownstone.smooth.chiseled" + }; - public SpeedBlockItem(Block b) - { + public SpeedBlockItem(Block b) { super(b, "block", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { int metadata = stack.getItemDamage(); - if (metadata == 1 || metadata == 4) - list.add(StatCollector.translateToLocal("speedblock1.tooltip")); - else - list.add(StatCollector.translateToLocal("speedblock2.tooltip")); + if (metadata == 1 || metadata == 4) list.add(StatCollector.translateToLocal("speedblock1.tooltip")); + else list.add(StatCollector.translateToLocal("speedblock2.tooltip")); } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java index a69e3a27d4f..4764f4b0f10 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java @@ -7,24 +7,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -public class SpeedSlabItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", "brownstone.smooth.chiseled" }; +public class SpeedSlabItem extends MultiItemBlock { + public static final String blockTypes[] = { + "brownstone.rough", + "brownstone.rough.road", + "brownstone.smooth", + "brownstone.smooth.brick", + "brownstone.smooth.road", + "brownstone.smooth.fancy", + "brownstone.smooth.chiseled" + }; - public SpeedSlabItem(Block b) - { + public SpeedSlabItem(Block b) { super(b, "block", "slab", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { int metadata = stack.getItemDamage() % 8; - if (metadata == 1 || metadata == 4) - list.add(StatCollector.translateToLocal("speedblock1.tooltip")); - else - list.add(StatCollector.translateToLocal("speedblock2.tooltip")); + if (metadata == 1 || metadata == 4) list.add(StatCollector.translateToLocal("speedblock1.tooltip")); + else list.add(StatCollector.translateToLocal("speedblock2.tooltip")); } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java index db62d6f47c3..5babf07b893 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java @@ -3,15 +3,29 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class StainedGlassClearItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; +public class StainedGlassClearItem extends MultiItemBlock { + public static final String blockTypes[] = { + "white", + "orange", + "magenta", + "lightblue", + "yellow", + "lime", + "pink", + "gray", + "lightgray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black" + }; - public StainedGlassClearItem(Block b) - { + public StainedGlassClearItem(Block b) { super(b, "block.stainedglass", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java index d238a06b0e8..3ffe3467023 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java @@ -3,15 +3,29 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class StainedGlassClearPaneItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; +public class StainedGlassClearPaneItem extends MultiItemBlock { + public static final String blockTypes[] = { + "white", + "orange", + "magenta", + "lightblue", + "yellow", + "lime", + "pink", + "gray", + "lightgray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black" + }; - public StainedGlassClearPaneItem(Block b) - { + public StainedGlassClearPaneItem(Block b) { super(b, "block.stainedglass", "pane", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/smeltery/items/ClayPattern.java b/src/main/java/tconstruct/smeltery/items/ClayPattern.java index 4fdf16537d1..249f30cbbf8 100644 --- a/src/main/java/tconstruct/smeltery/items/ClayPattern.java +++ b/src/main/java/tconstruct/smeltery/items/ClayPattern.java @@ -5,32 +5,54 @@ import net.minecraft.item.*; import tconstruct.tools.items.Pattern; -public class ClayPattern extends Pattern -{ +public class ClayPattern extends Pattern { - public ClayPattern(String patternType, String folder) - { + public ClayPattern(String patternType, String folder) { super(patternName, getPatternNames(patternType), folder); } - protected static String[] getPatternNames (String partType) - { + protected static String[] getPatternNames(String partType) { String[] names = new String[patternName.length]; for (int i = 0; i < patternName.length; i++) - if (!(patternName[i].equals(""))) - names[i] = partType + patternName[i]; - else - names[i] = ""; + if (!(patternName[i].equals(""))) names[i] = partType + patternName[i]; + else names[i] = ""; return names; } - private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "", "", "", "", "", "", "", "", "fullguard", "", "", "arrowhead", "gem", "nugget" }; + private static final String[] patternName = new String[] { + "ingot", + "rod", + "pickaxe", + "shovel", + "axe", + "swordblade", + "largeguard", + "mediumguard", + "crossbar", + "binding", + "frypan", + "sign", + "knifeblade", + "chisel", + "", + "", + "", + "", + "", + "", + "", + "", + "fullguard", + "", + "", + "arrowhead", + "gem", + "nugget" + }; @Override - public void getSubItems (Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) - { + public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { for (int i = 0; i < patternName.length; i++) - if (!(patternName[i].equals(""))) - p_150895_3_.add(new ItemStack(p_150895_1_, 1, i)); + if (!(patternName[i].equals(""))) p_150895_3_.add(new ItemStack(p_150895_1_, 1, i)); } } diff --git a/src/main/java/tconstruct/smeltery/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java index 9fedef3fb9b..c442bbdc2a4 100644 --- a/src/main/java/tconstruct/smeltery/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -15,11 +15,9 @@ import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; -public class FilledBucket extends ItemBucket -{ +public class FilledBucket extends ItemBucket { - public FilledBucket(Block b) - { + public FilledBucket(Block b) { super(b); // setTextureFile(TRepo.craftingTexture); // setIconIndex(224); @@ -29,85 +27,73 @@ public FilledBucket(Block b) } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { float var4 = 1.0F; double trueX = player.prevPosX + (player.posX - player.prevPosX) * (double) var4; - double trueY = player.prevPosY + (player.posY - player.prevPosY) * (double) var4 + 1.62D - (double) player.yOffset; + double trueY = + player.prevPosY + (player.posY - player.prevPosY) * (double) var4 + 1.62D - (double) player.yOffset; double trueZ = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) var4; boolean wannabeFull = false; MovingObjectPosition position = this.getMovingObjectPositionFromPlayer(world, player, wannabeFull); - if (position == null) - { + if (position == null) { return stack; - } - else - { + } else { /* * FillBucketEvent event = new FillBucketEvent(player, stack, world, * position); if (MinecraftForge.EVENT_BUS.post(event)) { return * stack; } - * + * * if (event.getResult() == Event.Result.ALLOW) { if * (player.capabilities.isCreativeMode) { return stack; } - * + * * if (--stack.stackSize <= 0) { return event.result; } - * + * * if (!player.inventory.addItemStackToInventory(event.result)) { * player.dropPlayerItem(event.result); } - * + * * return stack; } */ - if (position.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { + if (position.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { int clickX = position.blockX; int clickY = position.blockY; int clickZ = position.blockZ; - if (!world.canMineBlock(player, clickX, clickY, clickZ)) - { + if (!world.canMineBlock(player, clickX, clickY, clickZ)) { return stack; } - if (position.sideHit == 0) - { + if (position.sideHit == 0) { --clickY; } - if (position.sideHit == 1) - { + if (position.sideHit == 1) { ++clickY; } - if (position.sideHit == 2) - { + if (position.sideHit == 2) { --clickZ; } - if (position.sideHit == 3) - { + if (position.sideHit == 3) { ++clickZ; } - if (position.sideHit == 4) - { + if (position.sideHit == 4) { --clickX; } - if (position.sideHit == 5) - { + if (position.sideHit == 5) { ++clickX; } - if (!player.canPlayerEdit(clickX, clickY, clickZ, position.sideHit, stack)) - { + if (!player.canPlayerEdit(clickX, clickY, clickZ, position.sideHit, stack)) { return stack; } - if (this.tryPlaceContainedLiquid(world, clickX, clickY, clickZ, stack.getItemDamage()) && !player.capabilities.isCreativeMode) - { + if (this.tryPlaceContainedLiquid(world, clickX, clickY, clickZ, stack.getItemDamage()) + && !player.capabilities.isCreativeMode) { return new ItemStack(Items.bucket); } } @@ -116,27 +102,20 @@ public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer pl } } - public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int clickZ, int type) - { - if (!WorldHelper.isAirBlock(world, clickX, clickY, clickZ) && world.getBlock(clickX, clickY, clickZ).getMaterial().isSolid()) - { + public boolean tryPlaceContainedLiquid(World world, int clickX, int clickY, int clickZ, int type) { + if (!WorldHelper.isAirBlock(world, clickX, clickY, clickZ) + && world.getBlock(clickX, clickY, clickZ).getMaterial().isSolid()) { return false; - } - else - { - try - { - if (TinkerSmeltery.fluidBlocks[type] == null) - return false; + } else { + try { + if (TinkerSmeltery.fluidBlocks[type] == null) return false; int metadata = 0; - if (TinkerSmeltery.fluidBlocks[type] instanceof BlockFluidFinite) - metadata = 7; + if (TinkerSmeltery.fluidBlocks[type] instanceof BlockFluidFinite) metadata = 7; - world.setBlock(clickX, clickY, clickZ, TinkerSmeltery.fluidBlocks[type], metadata, 3); // TODO: Merge liquids - } - catch (ArrayIndexOutOfBoundsException ex) - { + world.setBlock( + clickX, clickY, clickZ, TinkerSmeltery.fluidBlocks[type], metadata, 3); // TODO: Merge liquids + } catch (ArrayIndexOutOfBoundsException ex) { TConstruct.logger.warn("AIOBE occured when placing bucket into world; " + ex); return false; } @@ -146,41 +125,101 @@ public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int } @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 0; i < icons.length; i++) - list.add(new ItemStack(b, 1, i)); + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 0; i < icons.length; i++) list.add(new ItemStack(b, 1, i)); } public IIcon[] icons; @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) - { + public IIcon getIconFromDamage(int meta) { return icons[meta]; } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:materials/bucket_" + textureNames[i]); } } @Override - public String getUnlocalizedName (ItemStack stack) - { + public String getUnlocalizedName(ItemStack stack) { int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, materialNames.length); return getUnlocalizedName() + "." + materialNames[arr]; } - public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron", "Lumium", "Signalum", "Mithril", "Enderium", "Quartz" }; - - public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron", "lumium", "signalum", "mithril", "enderium", "quartz" }; + public static final String[] materialNames = new String[] { + "Iron", + "Gold", + "Copper", + "Tin", + "Aluminum", + "Cobalt", + "Ardite", + "Bronze", + "AluBrass", + "Manyullyn", + "Alumite", + "Obsidian", + "Steel", + "Glass", + "Stone", + "Villager", + "Cow", + "Nickel", + "Lead", + "Silver", + "Shiny", + "Invar", + "Electrum", + "Ender", + "Slime", + "Glue", + "PigIron", + "Lumium", + "Signalum", + "Mithril", + "Enderium", + "Quartz" + }; + + public static final String[] textureNames = new String[] { + "iron", + "gold", + "copper", + "tin", + "aluminum", + "cobalt", + "ardite", + "bronze", + "alubrass", + "manyullyn", + "alumite", + "obsidian", + "steel", + "glass", + "stone", + "emerald", + "blood", + "nickel", + "lead", + "silver", + "shiny", + "invar", + "electrum", + "ender", + "slime", + "glue", + "pigiron", + "lumium", + "signalum", + "mithril", + "enderium", + "quartz" + }; } diff --git a/src/main/java/tconstruct/smeltery/items/MetalPattern.java b/src/main/java/tconstruct/smeltery/items/MetalPattern.java index 7c3f4d95df8..bca375ff2c7 100644 --- a/src/main/java/tconstruct/smeltery/items/MetalPattern.java +++ b/src/main/java/tconstruct/smeltery/items/MetalPattern.java @@ -5,32 +5,54 @@ import net.minecraft.item.*; import tconstruct.tools.items.Pattern; -public class MetalPattern extends Pattern -{ +public class MetalPattern extends Pattern { - public MetalPattern(String patternType, String folder) - { + public MetalPattern(String patternType, String folder) { super(patternName, getPatternNames(patternType), folder); } - protected static String[] getPatternNames (String partType) - { + protected static String[] getPatternNames(String partType) { String[] names = new String[patternName.length]; for (int i = 0; i < patternName.length; i++) - if (!(patternName[i].equals(""))) - names[i] = partType + patternName[i]; - else - names[i] = ""; + if (!(patternName[i].equals(""))) names[i] = partType + patternName[i]; + else names[i] = ""; return names; } - private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem", "nugget" }; + private static final String[] patternName = new String[] { + "ingot", + "rod", + "pickaxe", + "shovel", + "axe", + "swordblade", + "largeguard", + "mediumguard", + "crossbar", + "binding", + "frypan", + "sign", + "knifeblade", + "chisel", + "largerod", + "toughbinding", + "largeplate", + "broadaxe", + "scythe", + "excavator", + "largeblade", + "hammerhead", + "fullguard", + "", + "", + "arrowhead", + "gem", + "nugget" + }; @Override - public void getSubItems (Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) - { + public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { for (int i = 0; i < patternName.length; i++) - if (!(patternName[i].equals(""))) - p_150895_3_.add(new ItemStack(p_150895_1_, 1, i)); + if (!(patternName[i].equals(""))) p_150895_3_.add(new ItemStack(p_150895_1_, 1, i)); } } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java index eb71661a2d7..d11cfe243e0 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java @@ -6,22 +6,18 @@ import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.event.*; -public class CastingBasinLogic extends CastingBlockLogic -{ - public CastingBasinLogic() - { +public class CastingBasinLogic extends CastingBlockLogic { + public CastingBasinLogic() { super(TConstructRegistry.getBasinCasting()); } @Override - public SmelteryCastEvent getCastingEvent (CastingRecipe recipe, FluidStack metal) - { + public SmelteryCastEvent getCastingEvent(CastingRecipe recipe, FluidStack metal) { return new SmelteryCastEvent.CastingBasin(recipe, metal); } @Override - public SmelteryCastedEvent getCastedEvent (CastingRecipe recipe, ItemStack result) - { + public SmelteryCastedEvent getCastedEvent(CastingRecipe recipe, ItemStack result) { return new SmelteryCastedEvent.CastingBasin(recipe, result); } } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index 7563c8f55ac..649f58c08e4 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -19,8 +19,7 @@ import tconstruct.library.tools.AbilityHelper; import tconstruct.library.util.IPattern; -public abstract class CastingBlockLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory -{ +public abstract class CastingBlockLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory { public FluidStack liquid; protected int maxCastingDelay = 0; protected int castingDelay = 0; @@ -31,49 +30,39 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid protected int tick; protected final LiquidCasting liquidCasting; - public CastingBlockLogic(LiquidCasting casting) - { + public CastingBlockLogic(LiquidCasting casting) { // input slot and output slot, 1 item in it max super(2, 1); this.liquidCasting = casting; } - public int updateCapacity () // Only used to initialize - { + public int updateCapacity() // Only used to initialize + { ItemStack inv = inventory[0]; int ret = TConstruct.ingotLiquidValue; int rec = liquidCasting.getCastingAmount(this.liquid, inv); - if (rec > 0) - ret = rec; - else - { - if (inv != null && inv.getItem() instanceof IPattern) - { + if (rec > 0) ret = rec; + else { + if (inv != null && inv.getItem() instanceof IPattern) { int cost = ((IPattern) inv.getItem()).getPatternCost(inv); - if (cost > 0) - ret *= ((IPattern) inv.getItem()).getPatternCost(inv) * 0.5; + if (cost > 0) ret *= ((IPattern) inv.getItem()).getPatternCost(inv) * 0.5; } } return ret; } - public int updateCapacity (int capacity) - { + public int updateCapacity(int capacity) { int ret = TConstruct.ingotLiquidValue; - if (capacity > 0) - ret = capacity; - else - { + if (capacity > 0) ret = capacity; + else { ItemStack inv = inventory[0]; - if (inv != null && inv.getItem() instanceof IPattern) - { + if (inv != null && inv.getItem() instanceof IPattern) { int cost = ((IPattern) inv.getItem()).getPatternCost(inv); - if (cost > 0) - ret *= cost * 0.5; + if (cost > 0) ret *= cost * 0.5; } } @@ -82,121 +71,98 @@ public int updateCapacity (int capacity) /* FluidHandler stuff. Mostly delegated to Tank stuff */ @Override - public int fill (ForgeDirection from, FluidStack resource, boolean doFill) - { + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return fill(resource, doFill); } @Override - public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) - { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { // only same liquid - if (liquid != null && liquid.getFluid() != resource.getFluid()) - return null; + if (liquid != null && liquid.getFluid() != resource.getFluid()) return null; return drain(resource.amount, doDrain); } @Override - public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) - { + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return drain(maxDrain, doDrain); } @Override - public boolean canFill (ForgeDirection from, Fluid fluid) - { - if(fluid == null) - return false; + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (fluid == null) return false; return fill(from, new FluidStack(fluid, 1), false) > 0; } @Override - public boolean canDrain (ForgeDirection from, Fluid fluid) - { - if(fluid == null) - return false; - + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (fluid == null) return false; + FluidStack drained = drain(from, new FluidStack(fluid, 1), false); return drained != null && drained.amount > 0; } /* Tank stuff */ @Override - public FluidTankInfo[] getTankInfo (ForgeDirection from) - { - return new FluidTankInfo[] { getInfo() }; + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {getInfo()}; } @Override - public FluidStack getFluid () - { + public FluidStack getFluid() { return liquid == null ? null : liquid.copy(); } @Override - public int getFluidAmount () - { + public int getFluidAmount() { return liquid != null ? liquid.amount : 0; } /** Returns the current amount of the liquid FOR RENDERING */ - public int getLiquidAmount () - { + public int getLiquidAmount() { return liquid.amount - renderOffset; } @Override - public int getCapacity () - { + public int getCapacity() { return this.capacity; } @Override - public FluidTankInfo getInfo () - { + public FluidTankInfo getInfo() { return new FluidTankInfo(this); } /** * Create and return the casting event here. It'll be fired automatically. */ - public abstract SmelteryCastEvent getCastingEvent (CastingRecipe recipe, FluidStack metal); + public abstract SmelteryCastEvent getCastingEvent(CastingRecipe recipe, FluidStack metal); @Override - public int fill (FluidStack resource, boolean doFill) - { - if (resource == null) - return 0; + public int fill(FluidStack resource, boolean doFill) { + if (resource == null) return 0; - if (this.liquid == null) - { + if (this.liquid == null) { CastingRecipe recipe = liquidCasting.getCastingRecipe(resource, inventory[0]); - if (recipe == null) - return 0; + if (recipe == null) return 0; SmelteryCastEvent event = getCastingEvent(recipe, resource); MinecraftForge.EVENT_BUS.post(event); - if (event.getResult() == Event.Result.DENY) - return 0; + if (event.getResult() == Event.Result.DENY) return 0; this.capacity = updateCapacity(recipe.castingMetal.amount); - if (inventory[1] == null) - { + if (inventory[1] == null) { FluidStack copyLiquid = resource.copy(); - if (copyLiquid.amount > this.capacity) - { + if (copyLiquid.amount > this.capacity) { copyLiquid.amount = this.capacity; } - if (doFill) - { - if (copyLiquid.amount == this.capacity) - { - maxCastingDelay= castingDelay = recipe.coolTime; + if (doFill) { + if (copyLiquid.amount == this.capacity) { + maxCastingDelay = castingDelay = recipe.coolTime; } renderOffset = copyLiquid.amount; worldObj.func_147479_m(xCoord, yCoord, zCoord); @@ -204,19 +170,14 @@ public int fill (FluidStack resource, boolean doFill) needsUpdate = true; } return copyLiquid.amount; - } - else - { + } else { return 0; } - } - else if (resource.isFluidEqual(this.liquid)) - { + } else if (resource.isFluidEqual(this.liquid)) { if (resource.amount + this.liquid.amount >= this.capacity) // Start timer here { int roomInTank = this.capacity - liquid.amount; - if (doFill && roomInTank > 0) - { + if (doFill && roomInTank > 0) { renderOffset = roomInTank; maxCastingDelay = castingDelay = liquidCasting.getCastingDelay(this.liquid, inventory[0]); this.liquid.amount = this.capacity; @@ -224,12 +185,8 @@ else if (resource.isFluidEqual(this.liquid)) needsUpdate = true; } return roomInTank; - } - - else - { - if (doFill) - { + } else { + if (doFill) { renderOffset += resource.amount; this.liquid.amount += resource.amount; worldObj.func_147479_m(xCoord, yCoord, zCoord); @@ -237,28 +194,20 @@ else if (resource.isFluidEqual(this.liquid)) } return resource.amount; } - } - - else - { + } else { return 0; } } @Override - public FluidStack drain (int maxDrain, boolean doDrain) - { - if (liquid == null || liquid.getFluid() == null || liquid.getFluidID() <= 0 || castingDelay > 0) - return null; - if (liquid.amount <= 0) - return null; + public FluidStack drain(int maxDrain, boolean doDrain) { + if (liquid == null || liquid.getFluid() == null || liquid.getFluidID() <= 0 || castingDelay > 0) return null; + if (liquid.amount <= 0) return null; int used = maxDrain; - if (liquid.amount < used) - used = liquid.amount; + if (liquid.amount < used) used = liquid.amount; - if (doDrain) - { + if (doDrain) { liquid.amount -= used; } @@ -268,52 +217,49 @@ public FluidStack drain (int maxDrain, boolean doDrain) renderOffset = 0; // Reset liquid if emptied - if (liquid.amount <= 0) - liquid = null; + if (liquid.amount <= 0) liquid = null; if (doDrain) - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this, used)); + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent( + drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this, used)); return drained; } /* Inventory, inserting/extracting */ - public void interact(EntityPlayer player) - { + public void interact(EntityPlayer player) { // only server side - //if(worldObj.isRemote) - //return; + // if(worldObj.isRemote) + // return; // can't interact with liquid inside // todo: maybe let it interact with a bucket or tank! - if(liquid != null) - return; + if (liquid != null) return; // put stuff in? - if(!isStackInSlot(0) && !isStackInSlot(1)) - { + if (!isStackInSlot(0) && !isStackInSlot(1)) { ItemStack stack = player.inventory.decrStackSize(player.inventory.currentItem, stackSizeLimit); - SmelteryEvent.ItemInsertedIntoCasting event = new SmelteryEvent.ItemInsertedIntoCasting(this, xCoord, yCoord, zCoord, stack, player); + SmelteryEvent.ItemInsertedIntoCasting event = + new SmelteryEvent.ItemInsertedIntoCasting(this, xCoord, yCoord, zCoord, stack, player); MinecraftForge.EVENT_BUS.post(event); - if(!event.isCanceled()) - setInventorySlotContents(0, event.item); + if (!event.isCanceled()) setInventorySlotContents(0, event.item); else - player.inventory.addItemStackToInventory(stack); // should never return false, since the itemstack was taken from the inventory + player.inventory.addItemStackToInventory( + stack); // should never return false, since the itemstack was taken from the inventory } // take stuff out. - else - { + else { int slot = 0; // output-slot has higher priority - if(isStackInSlot(1)) - slot = 1; + if (isStackInSlot(1)) slot = 1; // Additional Info: Only 1 item can only be put into the casting block usually, however recipes // can have multiple blocks as output (compressed gravel -> brownstone for example) // we therefore spill the whole contents on extraction - SmelteryEvent.ItemRemovedFromCasting event = new SmelteryEvent.ItemRemovedFromCasting(this, xCoord, yCoord, zCoord, getStackInSlot(slot), player); + SmelteryEvent.ItemRemovedFromCasting event = new SmelteryEvent.ItemRemovedFromCasting( + this, xCoord, yCoord, zCoord, getStackInSlot(slot), player); MinecraftForge.EVENT_BUS.post(event); // try to transfer thes tack to the player inventory @@ -326,137 +272,110 @@ public void interact(EntityPlayer player) } @Override - public ItemStack decrStackSize (int slot, int quantity) - { + public ItemStack decrStackSize(int slot, int quantity) { ItemStack stack = super.decrStackSize(slot, quantity); worldObj.func_147479_m(xCoord, yCoord, zCoord); return stack; } @Override - public int[] getAccessibleSlotsFromSide (int side) - { - return new int[] { 0, 1 }; + public int[] getAccessibleSlotsFromSide(int side) { + return new int[] {0, 1}; } @Override - public boolean canInsertItem (int slot, ItemStack itemstack, int side) - { + public boolean canInsertItem(int slot, ItemStack itemstack, int side) { // can't insert if there's liquid in it - if (liquid != null) - return false; + if (liquid != null) return false; // only into input slot return slot == 0; } @Override - public boolean canExtractItem (int slot, ItemStack itemstack, int side) - { + public boolean canExtractItem(int slot, ItemStack itemstack, int side) { // only output slot return slot == 1; } /* We don't have a gui or anything */ @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return null; } @Override - protected String getDefaultName () - { + protected String getDefaultName() { return null; } @Override - public String getInventoryName () - { + public String getInventoryName() { return null; } @Override - public String getInvName () - { + public String getInvName() { return null; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public void openInventory () - { - - } + public void openInventory() {} @Override - public void closeInventory () - { - - } + public void closeInventory() {} /* NBT, Updating */ @Override - public void markDirty () // Isn't actually called? - { + public void markDirty() // Isn't actually called? + { super.markDirty(); worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } @Override - public void updateEntity () - { - if (castingDelay > 0) - { + public void updateEntity() { + if (castingDelay > 0) { castingDelay--; - if (castingDelay == 0) - castLiquid(); + if (castingDelay == 0) castLiquid(); } - if (renderOffset > 0) - { - //renderOffset -= Math.max(renderOffset/3, 6); + if (renderOffset > 0) { + // renderOffset -= Math.max(renderOffset/3, 6); renderOffset -= 6; - if(renderOffset < 0) - renderOffset = 0; + if (renderOffset < 0) renderOffset = 0; worldObj.func_147479_m(xCoord, yCoord, zCoord); } tick++; - if (tick % 20 == 0) - { + if (tick % 20 == 0) { tick = 0; - if (needsUpdate) - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if (needsUpdate) worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } /** * Create and return the casting event here. It'll be fired automatically. */ - public abstract SmelteryCastedEvent getCastedEvent (CastingRecipe recipe, ItemStack result); + public abstract SmelteryCastedEvent getCastedEvent(CastingRecipe recipe, ItemStack result); - public void castLiquid () - { + public void castLiquid() { CastingRecipe recipe = liquidCasting.getCastingRecipe(liquid, inventory[0]); - if (recipe != null) - { + if (recipe != null) { SmelteryCastedEvent event = getCastedEvent(recipe, recipe.getResult()); MinecraftForge.EVENT_BUS.post(event); maxCastingDelay = 0; inventory[1] = event.output; - if (event.consumeCast) - inventory[0] = null; + if (event.consumeCast) inventory[0] = null; // if we just created a cast, move it to the first slot so we can use it directly afterwards - if (event.output != null && event.output.getItem() instanceof IPattern) - { + if (event.output != null && event.output.getItem() instanceof IPattern) { inventory[1] = inventory[0]; inventory[0] = event.output; } @@ -467,42 +386,32 @@ public void castLiquid () } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); readCustomNBT(tags); } - public void readCustomNBT (NBTTagCompound tags) - { - if (tags.getBoolean("hasLiquid")) - { + public void readCustomNBT(NBTTagCompound tags) { + if (tags.getBoolean("hasLiquid")) { this.liquid = FluidStack.loadFluidStackFromNBT(tags.getCompoundTag("Fluid")); - } - else - this.liquid = null; + } else this.liquid = null; - if (tags.getBoolean("Initialized")) - this.capacity = tags.getInteger("Capacity"); - else - this.capacity = updateCapacity(); + if (tags.getBoolean("Initialized")) this.capacity = tags.getInteger("Capacity"); + else this.capacity = updateCapacity(); this.castingDelay = tags.getInteger("castingDelay"); this.maxCastingDelay = tags.getInteger("maxCastingDelay"); this.renderOffset = tags.getInteger("RenderOffset"); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); writeCustomNBT(tags); } - public void writeCustomNBT (NBTTagCompound tags) - { + public void writeCustomNBT(NBTTagCompound tags) { tags.setBoolean("hasLiquid", liquid != null); - if (liquid != null) - { + if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); liquid.writeToNBT(nbt); tags.setTag("Fluid", nbt); @@ -516,25 +425,23 @@ public void writeCustomNBT (NBTTagCompound tags) /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } public int getProgress() { - if(castingDelay == 0 || maxCastingDelay == 0) { + if (castingDelay == 0 || maxCastingDelay == 0) { return 0; } - return (int)(( (maxCastingDelay - castingDelay) / (double)maxCastingDelay) * 100); + return (int) (((maxCastingDelay - castingDelay) / (double) maxCastingDelay) * 100); } } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index 62077192a44..8ae61cb7f8c 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -14,11 +14,9 @@ /** * @author BluSunrize */ - -public class CastingChannelLogic extends TileEntity implements IFluidHandler -{ - public final static int fillMax = TConstruct.ingotLiquidValue * 3; - public final static int outputMax = TConstruct.ingotLiquidValue; +public class CastingChannelLogic extends TileEntity implements IFluidHandler { + public static final int fillMax = TConstruct.ingotLiquidValue * 3; + public static final int outputMax = TConstruct.ingotLiquidValue; FluidTank internalTank = new FluidTank(fillMax); HashMap subTanks = new HashMap(); public ForgeDirection lastProvider; @@ -30,8 +28,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler public CastingChannelMode mode = CastingChannelMode.SINGLEDRAIN; */ - public CastingChannelLogic() - { + public CastingChannelLogic() { lastProvider = ForgeDirection.UNKNOWN; validOutputs.add(ForgeDirection.DOWN); validOutputs.add(ForgeDirection.NORTH); @@ -46,8 +43,7 @@ public CastingChannelLogic() } @Override - public void updateEntity () - { + public void updateEntity() { ticks++; boolean flagActiveFaucet = false; @@ -56,21 +52,18 @@ public void updateEntity () if (possibleFaucet != null && possibleFaucet instanceof FaucetLogic) flagActiveFaucet = ((FaucetLogic) possibleFaucet).active; - if (ticks == 6)// && !flagActiveFaucet) - this.distributeFluids(); - if (ticks >= 12)// && !flagActiveFaucet) + if (ticks == 6) // && !flagActiveFaucet) + this.distributeFluids(); + if (ticks >= 12) // && !flagActiveFaucet) { - if (recentlyFilledDelay != 0) - recentlyFilledDelay--; - if (recentlyFilledDelay == 0 || lastProvider == ForgeDirection.UP) - this.outputFluids(); + if (recentlyFilledDelay != 0) recentlyFilledDelay--; + if (recentlyFilledDelay == 0 || lastProvider == ForgeDirection.UP) this.outputFluids(); ticks = 0; } } - public void changeOutputs (EntityPlayer player, int side, float hitX, float hitY, float hitZ) - { + public void changeOutputs(EntityPlayer player, int side, float hitX, float hitY, float hitZ) { /* * UNUSED if(player.isSneaking()) @@ -88,104 +81,69 @@ public void changeOutputs (EntityPlayer player, int side, float hitX, float hitY */ ForgeDirection toggle = ForgeDirection.UNKNOWN; - if (side == 0 || side == 1) - { - if (hitX > 0.3125 && hitX < 0.6875) - if (hitZ > 0 && hitZ < 0.3125) - toggle = ForgeDirection.NORTH; - if (hitX > 0.3125 && hitX < 0.6875) - if (hitZ > 0.6875 && hitZ < 1) - toggle = ForgeDirection.SOUTH; - if (hitZ > 0.3125 && hitZ < 0.6875) - if (hitX > 0 && hitX < 0.3125) - toggle = ForgeDirection.WEST; - if (hitZ > 0.3125 && hitZ < 0.6875) - if (hitX > 0.6875 && hitX < 1) - toggle = ForgeDirection.EAST; + if (side == 0 || side == 1) { + if (hitX > 0.3125 && hitX < 0.6875) if (hitZ > 0 && hitZ < 0.3125) toggle = ForgeDirection.NORTH; + if (hitX > 0.3125 && hitX < 0.6875) if (hitZ > 0.6875 && hitZ < 1) toggle = ForgeDirection.SOUTH; + if (hitZ > 0.3125 && hitZ < 0.6875) if (hitX > 0 && hitX < 0.3125) toggle = ForgeDirection.WEST; + if (hitZ > 0.3125 && hitZ < 0.6875) if (hitX > 0.6875 && hitX < 1) toggle = ForgeDirection.EAST; if (side == 0) - if (hitX > 0.3125 && hitX < 0.6875) - if (hitZ > 0.3125 && hitZ < 0.6875) - toggle = ForgeDirection.DOWN; - } - else - { - if (side == 2) - { - if (hitX > 0 && hitX < 0.3125) - toggle = ForgeDirection.WEST; - if (hitX > 0.6875 && hitX < 1) - toggle = ForgeDirection.EAST; + if (hitX > 0.3125 && hitX < 0.6875) if (hitZ > 0.3125 && hitZ < 0.6875) toggle = ForgeDirection.DOWN; + } else { + if (side == 2) { + if (hitX > 0 && hitX < 0.3125) toggle = ForgeDirection.WEST; + if (hitX > 0.6875 && hitX < 1) toggle = ForgeDirection.EAST; } - if (side == 3) - { - if (hitX > 0 && hitX < 0.3125) - toggle = ForgeDirection.WEST; - if (hitX > 0.6875 && hitX < 1) - toggle = ForgeDirection.EAST; + if (side == 3) { + if (hitX > 0 && hitX < 0.3125) toggle = ForgeDirection.WEST; + if (hitX > 0.6875 && hitX < 1) toggle = ForgeDirection.EAST; } - if (side == 4) - { - if (hitZ > 0 && hitZ < 0.3125) - toggle = ForgeDirection.NORTH; - if (hitZ > 0.6875 && hitZ < 1) - toggle = ForgeDirection.SOUTH; + if (side == 4) { + if (hitZ > 0 && hitZ < 0.3125) toggle = ForgeDirection.NORTH; + if (hitZ > 0.6875 && hitZ < 1) toggle = ForgeDirection.SOUTH; } - if (side == 5) - { - if (hitZ > 0 && hitZ < 0.3125) - toggle = ForgeDirection.NORTH; - if (hitZ > 0.6875 && hitZ < 1) - toggle = ForgeDirection.SOUTH; + if (side == 5) { + if (hitZ > 0 && hitZ < 0.3125) toggle = ForgeDirection.NORTH; + if (hitZ > 0.6875 && hitZ < 1) toggle = ForgeDirection.SOUTH; } } - if (toggle != ForgeDirection.UNKNOWN && toggle != ForgeDirection.UP) - { - TileEntity tile = worldObj.getTileEntity(xCoord + toggle.offsetX, yCoord + toggle.offsetY, zCoord + toggle.offsetZ); + if (toggle != ForgeDirection.UNKNOWN && toggle != ForgeDirection.UP) { + TileEntity tile = + worldObj.getTileEntity(xCoord + toggle.offsetX, yCoord + toggle.offsetY, zCoord + toggle.offsetZ); if (tile instanceof IFluidHandler) - if (validOutputs.contains(toggle)) - { + if (validOutputs.contains(toggle)) { validOutputs.remove(toggle); if (tile instanceof CastingChannelLogic && toggle != ForgeDirection.DOWN) ((CastingChannelLogic) tile).validOutputs.remove(toggle.getOpposite()); - } - else - { + } else { validOutputs.add(toggle); if (tile instanceof CastingChannelLogic && toggle != ForgeDirection.DOWN) if (!((CastingChannelLogic) tile).validOutputs.contains(toggle.getOpposite())) ((CastingChannelLogic) tile).validOutputs.add(toggle.getOpposite()); } - } markDirtyForRendering(); } - private void distributeFluids () - { + private void distributeFluids() { /* DEBUG boolean printDebugLog = false; ArrayList debugLog = new ArrayList(); */ - //Move Fluid to Output Tanks + // Move Fluid to Output Tanks Set connected = this.getOutputs().keySet(); - if (connected.contains(ForgeDirection.DOWN)) - connected.remove(ForgeDirection.DOWN); - if (connected.contains(lastProvider)) - connected.remove(lastProvider); + if (connected.contains(ForgeDirection.DOWN)) connected.remove(ForgeDirection.DOWN); + if (connected.contains(lastProvider)) connected.remove(lastProvider); int output = Math.min(internalTank.getFluidAmount(), outputMax); int connectedAmount = connected.size(); - if (connectedAmount < 1) - connectedAmount = 1; + if (connectedAmount < 1) connectedAmount = 1; int scaledAmount = output / connectedAmount; - for (ForgeDirection dirOut : connected) - { - if (this.internalTank.getFluid() == null) - break; + for (ForgeDirection dirOut : connected) { + if (this.internalTank.getFluid() == null) break; /* DEBUG debugLog.add("Moving to "+dirOut+"ern SubTank"); @@ -195,8 +153,7 @@ private void distributeFluids () /* DEBUG debugLog.add("SubTank will accept "+fit+"mb"); */ - if (fit > 0) - fit = internalTank.drain(fit, true).amount; + if (fit > 0) fit = internalTank.drain(fit, true).amount; /* DEBUG debugLog.add("Internal Tank was drained by "+fit+"mb"); */ @@ -221,20 +178,20 @@ private void distributeFluids () printDebugLog = false; */ - //Get Fluid from most recent InputTank + // Get Fluid from most recent InputTank FluidTank inputTank = subTanks.get(lastProvider); - if (inputTank != null && inputTank.getFluid() != null) //Tank can be null if input was received from top + if (inputTank != null && inputTank.getFluid() != null) // Tank can be null if input was received from top { /* DEBUG debugLog.add("Importing from "+lastProvider+"ern SubTank"); */ - FluidStack tempFS = new FluidStack(inputTank.getFluid().getFluid(), Math.min(inputTank.getFluidAmount(), outputMax)); + FluidStack tempFS = + new FluidStack(inputTank.getFluid().getFluid(), Math.min(inputTank.getFluidAmount(), outputMax)); int fit = internalTank.fill(tempFS, false); /* DEBUG debugLog.add("Internal Tank will accept "+fit+"mb"); */ - if (fit > 0) - fit = inputTank.drain(fit, true).amount; + if (fit > 0) fit = inputTank.drain(fit, true).amount; /* DEBUG debugLog.add("Import Tank was drained by "+fit+"mb"); */ @@ -259,44 +216,42 @@ private void distributeFluids () */ } - private void outputFluids () - { + private void outputFluids() { /* DEBUG boolean printDebugLog = false; ArrayList debugLog = new ArrayList(); */ HashMap connected = this.getOutputs(); - if (connected.containsKey(lastProvider)) - connected.remove(lastProvider); - if (connected.containsKey(ForgeDirection.DOWN) && this.internalTank.getFluid() != null) // Prioritizes FluidHandlers below + if (connected.containsKey(lastProvider)) connected.remove(lastProvider); + if (connected.containsKey(ForgeDirection.DOWN) + && this.internalTank.getFluid() != null) // Prioritizes FluidHandlers below { int output = Math.min(internalTank.getFluid().amount, outputMax); FluidStack tempFS = new FluidStack(internalTank.getFluid().getFluid(), output); - int fittingBelow = ((IFluidHandler) connected.get(ForgeDirection.DOWN)).fill(ForgeDirection.UP, tempFS, false); - if (fittingBelow > 0) - fittingBelow = this.drain(ForgeDirection.DOWN, fittingBelow, true).amount; + int fittingBelow = + ((IFluidHandler) connected.get(ForgeDirection.DOWN)).fill(ForgeDirection.UP, tempFS, false); + if (fittingBelow > 0) fittingBelow = this.drain(ForgeDirection.DOWN, fittingBelow, true).amount; tempFS.amount = fittingBelow; fittingBelow = ((IFluidHandler) connected.get(ForgeDirection.DOWN)).fill(ForgeDirection.UP, tempFS, true); connected.remove(ForgeDirection.DOWN); } - if (connected.size() != 0) - { - for (ForgeDirection dir : connected.keySet()) //Iterates to connected FluidHandlers + if (connected.size() != 0) { + for (ForgeDirection dir : connected.keySet()) // Iterates to connected FluidHandlers { - if (subTanks.get(dir) != null && subTanks.get(dir).getFluid() != null) - { + if (subTanks.get(dir) != null && subTanks.get(dir).getFluid() != null) { /* DEBUG debugLog.add("Exporting from "+dir+"ern SubTank"); */ - FluidStack tempFS = new FluidStack(subTanks.get(dir).getFluid().getFluid(), Math.min(subTanks.get(dir).getFluidAmount(), outputMax)); + FluidStack tempFS = new FluidStack( + subTanks.get(dir).getFluid().getFluid(), + Math.min(subTanks.get(dir).getFluidAmount(), outputMax)); int fit = ((IFluidHandler) connected.get(dir)).fill(dir.getOpposite(), tempFS, false); /* DEBUG debugLog.add("New Channel will accept "+fit+"mb"); */ - if (fit > 0) - fit = this.drain(dir, fit, true).amount; + if (fit > 0) fit = this.drain(dir, fit, true).amount; /* DEBUG debugLog.add("OldSubTank was drained by "+fit+"mb"); */ @@ -320,92 +275,77 @@ private void outputFluids () } @SideOnly(Side.CLIENT) - public float tankBelow () - { + public float tankBelow() { TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); - if (te instanceof CastingChannelLogic) - return -0.5f; - if (te instanceof LavaTankLogic) - return -1.0f; - if (te instanceof CastingBasinLogic) - return -0.75f; - if (te instanceof CastingTableLogic) - return -0.125f; - if (te instanceof IFluidHandler) - return 0f; + if (te instanceof CastingChannelLogic) return -0.5f; + if (te instanceof LavaTankLogic) return -1.0f; + if (te instanceof CastingBasinLogic) return -0.75f; + if (te instanceof CastingTableLogic) return -0.125f; + if (te instanceof IFluidHandler) return 0f; return 0.5f; } - private void markDirtyForRendering () - { + private void markDirtyForRendering() { this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } - public HashMap getOutputs () - { + public HashMap getOutputs() { HashMap map = new HashMap(); - for (ForgeDirection fd : this.validOutputs) - { + for (ForgeDirection fd : this.validOutputs) { int tX = this.xCoord + fd.offsetX; int tY = this.yCoord + fd.offsetY; int tZ = this.zCoord + fd.offsetZ; TileEntity tile = this.worldObj.getTileEntity(tX, tY, tZ); - if (tile != null && tile instanceof IFluidHandler) - map.put(fd, tile); + if (tile != null && tile instanceof IFluidHandler) map.put(fd, tile); } return map; } @Override - public int fill (ForgeDirection from, FluidStack resource, boolean doFill) - { - if (doFill) - { + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (doFill) { markDirtyForRendering(); this.lastProvider = from; - //if (this.internalTank.getFluid() == null) - //this.recentlyFilledDelay = 2; + // if (this.internalTank.getFluid() == null) + // this.recentlyFilledDelay = 2; } - if (from == ForgeDirection.UP) - { + if (from == ForgeDirection.UP) { return this.internalTank.fill(resource, doFill); - } - else if (from == ForgeDirection.NORTH || from == ForgeDirection.SOUTH || from == ForgeDirection.WEST || from == ForgeDirection.EAST) - { + } else if (from == ForgeDirection.NORTH + || from == ForgeDirection.SOUTH + || from == ForgeDirection.WEST + || from == ForgeDirection.EAST) { return this.subTanks.get(from).fill(resource, doFill); } return 0; } @Override - public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) - { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { FluidStack fluidStack = null; if (from == ForgeDirection.DOWN) - if(this.internalTank.getFluid() != null) - fluidStack = this.internalTank.getFluid(); - else if(validOutputs.contains(from)) + if (this.internalTank.getFluid() != null) fluidStack = this.internalTank.getFluid(); + else if (validOutputs.contains(from)) fluidStack = this.subTanks.get(from).getFluid(); // wrong fluid - if(fluidStack != null && fluidStack.getFluid() != resource.getFluid()) - return null; + if (fluidStack != null && fluidStack.getFluid() != resource.getFluid()) return null; return drain(from, resource.amount, doDrain); } @Override - public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) - { - //if(doDrain) + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + // if(doDrain) // this.worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); - if (from == ForgeDirection.DOWN) - return this.internalTank.drain(maxDrain, doDrain); - else if (from == ForgeDirection.NORTH || from == ForgeDirection.SOUTH || from == ForgeDirection.WEST || from == ForgeDirection.EAST) - { + if (from == ForgeDirection.DOWN) return this.internalTank.drain(maxDrain, doDrain); + else if (from == ForgeDirection.NORTH + || from == ForgeDirection.SOUTH + || from == ForgeDirection.WEST + || from == ForgeDirection.EAST) { return this.subTanks.get(from).drain(maxDrain, doDrain); } @@ -413,59 +353,45 @@ else if (from == ForgeDirection.NORTH || from == ForgeDirection.SOUTH || from == } @Override - public boolean canFill (ForgeDirection from, Fluid fluid) - { - if (from == ForgeDirection.DOWN) - return false; - if (from == ForgeDirection.UP) - return true; + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (from == ForgeDirection.DOWN) return false; + if (from == ForgeDirection.UP) return true; return validOutputs.contains(from); } @Override - public boolean canDrain (ForgeDirection from, Fluid fluid) - { - if (from == ForgeDirection.UP) - return false; + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (from == ForgeDirection.UP) return false; return validOutputs.contains(from); } @Override - public FluidTankInfo[] getTankInfo (ForgeDirection from) - { + public FluidTankInfo[] getTankInfo(ForgeDirection from) { if (from == null || from == ForgeDirection.UP || from == ForgeDirection.DOWN || from == ForgeDirection.UNKNOWN) - return new FluidTankInfo[] { new FluidTankInfo(internalTank) }; - else - return new FluidTankInfo[] { new FluidTankInfo(subTanks.get(from)) }; + return new FluidTankInfo[] {new FluidTankInfo(internalTank)}; + else return new FluidTankInfo[] {new FluidTankInfo(subTanks.get(from))}; } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); readCustomNBT(tags); } - public void readCustomNBT (NBTTagCompound tags) - { + public void readCustomNBT(NBTTagCompound tags) { NBTTagCompound nbtTank = tags.getCompoundTag("internalTank"); - if (nbtTank != null) - internalTank.readFromNBT(nbtTank); + if (nbtTank != null) internalTank.readFromNBT(nbtTank); - for (ForgeDirection fdSub : subTanks.keySet()) - { + for (ForgeDirection fdSub : subTanks.keySet()) { NBTTagCompound nbtSubTank = tags.getCompoundTag("subTank_" + fdSub.name()); - if (nbtSubTank != null) - subTanks.get(fdSub).readFromNBT(nbtSubTank); + if (nbtSubTank != null) subTanks.get(fdSub).readFromNBT(nbtSubTank); } int[] validFDs = tags.getIntArray("validOutputs"); - if (validFDs != null) - { + if (validFDs != null) { validOutputs = new ArrayList(); - for (int i : validFDs) - validOutputs.add(convertIntToFD(i)); + for (int i : validFDs) validOutputs.add(convertIntToFD(i)); } /* UNUSED this.mode = CastingChannelMode.readFromNBT(tags); @@ -474,19 +400,16 @@ public void readCustomNBT (NBTTagCompound tags) } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); writeCustomNBT(tags); } - public void writeCustomNBT (NBTTagCompound tags) - { + public void writeCustomNBT(NBTTagCompound tags) { NBTTagCompound nbtTank = new NBTTagCompound(); internalTank.writeToNBT(nbtTank); tags.setTag("internalTank", nbtTank); - for (ForgeDirection fdSub : subTanks.keySet()) - { + for (ForgeDirection fdSub : subTanks.keySet()) { NBTTagCompound nbtSubTank = new NBTTagCompound(); subTanks.get(fdSub).writeToNBT(nbtSubTank); tags.setTag("subTank_" + fdSub.name(), nbtSubTank); @@ -494,10 +417,8 @@ public void writeCustomNBT (NBTTagCompound tags) int[] validFDs = new int[validOutputs.size()]; int it = 0; - for (ForgeDirection fd : validOutputs) - { - if (fd != null) - validFDs[it] = convertFDToInt(fd); + for (ForgeDirection fd : validOutputs) { + if (fd != null) validFDs[it] = convertFDToInt(fd); it++; } tags.setIntArray("validOutputs", validFDs); @@ -508,59 +429,53 @@ public void writeCustomNBT (NBTTagCompound tags) } @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); this.worldObj.func_147479_m(this.xCoord, this.yCoord, this.zCoord); } - public int convertFDToInt (ForgeDirection dir) - { - switch (dir) - { - case DOWN: - return 0; - case UP: - return 1; - case NORTH: - return 2; - case SOUTH: - return 3; - case WEST: - return 4; - case EAST: - return 5; - default: - return -1; + public int convertFDToInt(ForgeDirection dir) { + switch (dir) { + case DOWN: + return 0; + case UP: + return 1; + case NORTH: + return 2; + case SOUTH: + return 3; + case WEST: + return 4; + case EAST: + return 5; + default: + return -1; } } - public ForgeDirection convertIntToFD (int i) - { - switch (i) - { - case 0: - return ForgeDirection.DOWN; - case 1: - return ForgeDirection.UP; - case 2: - return ForgeDirection.NORTH; - case 3: - return ForgeDirection.SOUTH; - case 4: - return ForgeDirection.WEST; - case 5: - return ForgeDirection.EAST; - default: - return ForgeDirection.UNKNOWN; + public ForgeDirection convertIntToFD(int i) { + switch (i) { + case 0: + return ForgeDirection.DOWN; + case 1: + return ForgeDirection.UP; + case 2: + return ForgeDirection.NORTH; + case 3: + return ForgeDirection.SOUTH; + case 4: + return ForgeDirection.WEST; + case 5: + return ForgeDirection.EAST; + default: + return ForgeDirection.UNKNOWN; } } /* UNUSED diff --git a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java index 58452b358dd..a94ca009fec 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java @@ -6,22 +6,18 @@ import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.event.*; -public class CastingTableLogic extends CastingBlockLogic -{ - public CastingTableLogic() - { +public class CastingTableLogic extends CastingBlockLogic { + public CastingTableLogic() { super(TConstructRegistry.getTableCasting()); } @Override - public SmelteryCastEvent getCastingEvent (CastingRecipe recipe, FluidStack metal) - { + public SmelteryCastEvent getCastingEvent(CastingRecipe recipe, FluidStack metal) { return new SmelteryCastEvent.CastingTable(recipe, metal); } @Override - public SmelteryCastedEvent getCastedEvent (CastingRecipe recipe, ItemStack result) - { + public SmelteryCastedEvent getCastedEvent(CastingRecipe recipe, ItemStack result) { return new SmelteryCastedEvent.CastingTable(recipe, result); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index 4e57315a4a4..b6fd2c5561f 100644 --- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -10,55 +10,49 @@ import net.minecraftforge.fluids.*; import tconstruct.TConstruct; -public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler -{ +public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler { byte direction; boolean active; public FluidStack liquid; public boolean hasRedstonePower = false; - public boolean activateFaucet () - { - if (liquid == null && active) - { + public boolean activateFaucet() { + if (liquid == null && active) { int x = xCoord, z = zCoord; - switch (getRenderDirection()) - { - case 2: - z++; - break; - case 3: - z--; - break; - case 4: - x++; - break; - case 5: - x--; - break; + switch (getRenderDirection()) { + case 2: + z++; + break; + case 3: + z--; + break; + case 4: + x++; + break; + case 5: + x--; + break; } TileEntity drainte = worldObj.getTileEntity(x, yCoord, z); TileEntity tankte = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); - if (drainte != null && drainte instanceof IFluidHandler && tankte != null && tankte instanceof IFluidHandler) - { - FluidStack templiquid = ((IFluidHandler) drainte).drain(getForgeDirection(), TConstruct.ingotLiquidValue, false); - if (templiquid != null) - { + if (drainte != null + && drainte instanceof IFluidHandler + && tankte != null + && tankte instanceof IFluidHandler) { + FluidStack templiquid = + ((IFluidHandler) drainte).drain(getForgeDirection(), TConstruct.ingotLiquidValue, false); + if (templiquid != null) { int drained = ((IFluidHandler) tankte).fill(ForgeDirection.UP, templiquid, false); - if (drained > 0) - { + if (drained > 0) { liquid = ((IFluidHandler) drainte).drain(getForgeDirection(), drained, true); ((IFluidHandler) tankte).fill(ForgeDirection.UP, liquid, true); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); return true; - } - else - { + } else { return false; } - } } } @@ -66,16 +60,12 @@ public boolean activateFaucet () } @Override - public void updateEntity () - { - if (liquid != null) - { + public void updateEntity() { + if (liquid != null) { liquid.amount -= TConstruct.liquidUpdateAmount; - if (liquid.amount <= 0) - { + if (liquid.amount <= 0) { liquid = null; - if (!activateFaucet()) - { + if (!activateFaucet()) { active = false; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @@ -84,33 +74,26 @@ public void updateEntity () } @Override - public byte getRenderDirection () - { + public byte getRenderDirection() { return direction; } @Override - public ForgeDirection getForgeDirection () - { + public ForgeDirection getForgeDirection() { return ForgeDirection.VALID_DIRECTIONS[direction]; } @Override - public void setDirection (int side) - { - if (side != 0 && side != 1) - { + public void setDirection(int side) { + if (side != 0 && side != 1) { direction = (byte) side; - } - else - { + } else { direction = 2; } } @Override - public void setDirection (float yaw, float pitch, EntityLivingBase player) - { + public void setDirection(float yaw, float pitch, EntityLivingBase player) { /*int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; switch (facing) { @@ -133,36 +116,28 @@ public void setDirection (float yaw, float pitch, EntityLivingBase player) } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); readCustomNBT(tags); } - public void readCustomNBT (NBTTagCompound tags) - { + public void readCustomNBT(NBTTagCompound tags) { direction = tags.getByte("Direction"); - if (tags.getBoolean("hasLiquid")) - { + if (tags.getBoolean("hasLiquid")) { this.liquid = FluidStack.loadFluidStackFromNBT(tags.getCompoundTag("Fluid")); - } - else - this.liquid = null; + } else this.liquid = null; } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); writeCustomNBT(tags); } - public void writeCustomNBT (NBTTagCompound tags) - { + public void writeCustomNBT(NBTTagCompound tags) { tags.setByte("Direction", direction); tags.setBoolean("hasLiquid", liquid != null); - if (liquid != null) - { + if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); liquid.writeToNBT(nbt); tags.setTag("Fluid", nbt); @@ -171,79 +146,65 @@ public void writeCustomNBT (NBTTagCompound tags) /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override - public boolean getActive () - { + public boolean getActive() { return active; } @Override - public void setActive (boolean flag) - { - if (!active) - { + public void setActive(boolean flag) { + if (!active) { active = true; - if (!activateFaucet()) - active = false; - } - else - { + if (!activateFaucet()) active = false; + } else { active = false; } } @Override - public int fill (ForgeDirection from, FluidStack resource, boolean doFill) - { + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { // TODO Auto-generated method stub return 0; } @Override - public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) - { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { // TODO Auto-generated method stub return null; } @Override - public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) - { + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { // TODO Auto-generated method stub return null; } @Override - public boolean canFill (ForgeDirection from, Fluid fluid) - { + public boolean canFill(ForgeDirection from, Fluid fluid) { // TODO Auto-generated method stub return false; } @Override - public boolean canDrain (ForgeDirection from, Fluid fluid) - { + public boolean canDrain(ForgeDirection from, Fluid fluid) { // TODO Auto-generated method stub return false; } @Override - public FluidTankInfo[] getTankInfo (ForgeDirection from) - { + public FluidTankInfo[] getTankInfo(ForgeDirection from) { // TODO Auto-generated method stub return null; } diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index f1fa6d7b752..d241d77bc38 100644 --- a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -7,23 +7,19 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; -public class LavaTankLogic extends MultiServantLogic implements IFluidHandler -{ +public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { public FluidTank tank; public int renderOffset; - public final static int tankCapacity = FluidContainerRegistry.BUCKET_VOLUME * 4; + public static final int tankCapacity = FluidContainerRegistry.BUCKET_VOLUME * 4; - public LavaTankLogic() - { + public LavaTankLogic() { tank = new FluidTank(tankCapacity); } @Override - public int fill (ForgeDirection from, FluidStack resource, boolean doFill) - { + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { int amount = tank.fill(resource, doFill); - if (amount > 0 && doFill) - { + if (amount > 0 && doFill) { renderOffset += resource.amount; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, this.getBlockType()); @@ -33,11 +29,9 @@ public int fill (ForgeDirection from, FluidStack resource, boolean doFill) } @Override - public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) - { + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { FluidStack amount = tank.drain(maxDrain, doDrain); - if (amount != null && doDrain) - { + if (amount != null && doDrain) { renderOffset = -maxDrain; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, this.getBlockType()); @@ -46,36 +40,30 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) } @Override - public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) - { - if (tank.getFluidAmount() == 0) - return null; - if (tank.getFluid().getFluid() != resource.getFluid()) - return null; + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (tank.getFluidAmount() == 0) return null; + if (tank.getFluid().getFluid() != resource.getFluid()) return null; // same fluid, k return this.drain(from, resource.amount, doDrain); } @Override - public boolean canFill (ForgeDirection from, Fluid fluid) - { - return tank.getFluidAmount() == 0 || (tank.getFluid().getFluid() == fluid && tank.getFluidAmount() < tank.getCapacity()); + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tank.getFluidAmount() == 0 + || (tank.getFluid().getFluid() == fluid && tank.getFluidAmount() < tank.getCapacity()); } @Override - public boolean canDrain (ForgeDirection from, Fluid fluid) - { + public boolean canDrain(ForgeDirection from, Fluid fluid) { return tank.getFluidAmount() > 0; } @Override - public FluidTankInfo[] getTankInfo (ForgeDirection from) - { + public FluidTankInfo[] getTankInfo(ForgeDirection from) { FluidStack fluid = null; - if (tank.getFluid() != null) - fluid = tank.getFluid().copy(); - return new FluidTankInfo[] { new FluidTankInfo(fluid, tank.getCapacity()) }; + if (tank.getFluid() != null) fluid = tank.getFluid().copy(); + return new FluidTankInfo[] {new FluidTankInfo(fluid, tank.getCapacity())}; } /* @@ -86,68 +74,52 @@ public FluidTankInfo[] getTankInfo (ForgeDirection from) * type) { return tank; } */ - public float getFluidAmountScaled () - { + public float getFluidAmountScaled() { return (float) (tank.getFluid().amount - renderOffset) / (float) (tank.getCapacity() * 1.01F); } - public boolean containsFluid () - { + public boolean containsFluid() { return tank.getFluid() != null; } - public int getBrightness () - { - if (containsFluid()) - { + public int getBrightness() { + if (containsFluid()) { return (tank.getFluid().getFluid().getLuminosity() * tank.getFluidAmount()) / tank.getCapacity(); } return 0; } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); readCustomNBT(tags); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); writeCustomNBT(tags); } @Override - public void readCustomNBT (NBTTagCompound tags) - { - if (tags.getBoolean("hasFluid")) - { + public void readCustomNBT(NBTTagCompound tags) { + if (tags.getBoolean("hasFluid")) { // TODO: Removed in future Versions, backward compat. - if (tags.getInteger("itemID") != 0) - { + if (tags.getInteger("itemID") != 0) { tank.setFluid(new FluidStack(tags.getInteger("itemID"), tags.getInteger("amount"))); - } - else - { + } else { tank.setFluid(FluidRegistry.getFluidStack(tags.getString("fluidName"), tags.getInteger("amount"))); } - } - else - tank.setFluid(null); + } else tank.setFluid(null); - if(tags.hasKey("renderOffset")) - renderOffset = tags.getInteger("renderOffset"); + if (tags.hasKey("renderOffset")) renderOffset = tags.getInteger("renderOffset"); } @Override - public void writeCustomNBT (NBTTagCompound tags) - { + public void writeCustomNBT(NBTTagCompound tags) { FluidStack liquid = tank.getFluid(); tags.setBoolean("hasFluid", liquid != null); - if (liquid != null) - { + if (liquid != null) { tags.setString("fluidName", liquid.getFluid().getName()); tags.setInteger("amount", liquid.amount); } @@ -156,42 +128,35 @@ public void writeCustomNBT (NBTTagCompound tags) /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } /* Updating */ @Override - public boolean canUpdate () - { + public boolean canUpdate() { return true; } @Override - public void updateEntity () - { - if (renderOffset != 0) - { - renderOffset -= renderOffset/12 + 1; // has to be at least 1 - - if(renderOffset < 0) - renderOffset = 0; + public void updateEntity() { + if (renderOffset != 0) { + renderOffset -= renderOffset / 12 + 1; // has to be at least 1 + + if (renderOffset < 0) renderOffset = 0; worldObj.func_147479_m(xCoord, yCoord, zCoord); } } - public int comparatorStrength () - { + public int comparatorStrength() { return 15 * tank.getFluidAmount() / tank.getCapacity(); } } diff --git a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java index 9a50003b597..1dfd2624b6a 100644 --- a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java @@ -5,63 +5,53 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -public class LiquidTextureLogic extends TileEntity -{ +public class LiquidTextureLogic extends TileEntity { int texturePos; @Override - public boolean canUpdate () - { + public boolean canUpdate() { return false; } - public void setLiquidType (int tex) - { + public void setLiquidType(int tex) { texturePos = tex; worldObj.func_147479_m(xCoord, yCoord, zCoord); } - public int getLiquidType () - { + public int getLiquidType() { return texturePos; } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); readCustomNBT(tags); } - public void readCustomNBT (NBTTagCompound tags) - { + public void readCustomNBT(NBTTagCompound tags) { texturePos = tags.getInteger("Texture"); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); writeCustomNBT(tags); } - public void writeCustomNBT (NBTTagCompound tags) - { + public void writeCustomNBT(NBTTagCompound tags) { tags.setInteger("Texture", texturePos); } @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index ed5edd726e6..cfca2196069 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -11,49 +11,41 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; -public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic -{ +public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic { byte direction; @Override - public boolean canUpdate () - { + public boolean canUpdate() { return false; } @Override - public int fill (ForgeDirection from, FluidStack resource, boolean doFill) - { - if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) - { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) { + SmelteryLogic smeltery = (SmelteryLogic) + worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.fill(resource, doFill); - } - else - { + } else { return 0; } } @Override - public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) - { - if (hasValidMaster() && canDrain(from, null)) - { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (hasValidMaster() && canDrain(from, null)) { + SmelteryLogic smeltery = (SmelteryLogic) + worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.drain(maxDrain, doDrain); } return null; } @Override - public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) - { - if (hasValidMaster() && canDrain(from, resource.getFluid())) - { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); - if (resource.getFluid() == smeltery.getFluid().getFluid()) - { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (hasValidMaster() && canDrain(from, resource.getFluid())) { + SmelteryLogic smeltery = (SmelteryLogic) + worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + if (resource.getFluid() == smeltery.getFluid().getFluid()) { return smeltery.drain(resource.amount, doDrain); } } @@ -61,28 +53,23 @@ public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDra } @Override - public boolean canFill (ForgeDirection from, Fluid fluid) - { + public boolean canFill(ForgeDirection from, Fluid fluid) { return true; // return from == getForgeDirection();//.getOpposite(); } @Override - public boolean canDrain (ForgeDirection from, Fluid fluid) - { + public boolean canDrain(ForgeDirection from, Fluid fluid) { // Check that the drain is coming from the from the front of the block // and that the fluid to be drained is in the smeltery. - if(!hasValidMaster()) - return false; - + if (!hasValidMaster()) return false; + boolean containsFluid = fluid == null; - if (fluid != null) - { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); - for (FluidStack fstack : smeltery.moltenMetal) - { - if (fstack.getFluidID() == fluid.getID()) - { + if (fluid != null) { + SmelteryLogic smeltery = (SmelteryLogic) + worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + for (FluidStack fstack : smeltery.moltenMetal) { + if (fstack.getFluidID() == fluid.getID()) { containsFluid = true; break; } @@ -93,11 +80,13 @@ public boolean canDrain (ForgeDirection from, Fluid fluid) } @Override - public FluidTankInfo[] getTankInfo (ForgeDirection from) - { - if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) - { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (hasValidMaster() + && (from == getForgeDirection() + || from == getForgeDirection().getOpposite() + || from == ForgeDirection.UNKNOWN)) { + SmelteryLogic smeltery = (SmelteryLogic) + worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.getMultiTankInfo(); // return new FluidTankInfo[] { smeltery.getInfo() }; } @@ -105,98 +94,81 @@ public FluidTankInfo[] getTankInfo (ForgeDirection from) } @Override - public byte getRenderDirection () - { + public byte getRenderDirection() { return direction; } @Override - public ForgeDirection getForgeDirection () - { + public ForgeDirection getForgeDirection() { return ForgeDirection.VALID_DIRECTIONS[direction]; } @Override - public void setDirection (int side) - { - - } + public void setDirection(int side) {} @Override - public void setDirection (float yaw, float pitch, EntityLivingBase player) - { - if (pitch > 45) - direction = 1; - else if (pitch < -45) - direction = 0; - else - { + public void setDirection(float yaw, float pitch, EntityLivingBase player) { + if (pitch > 45) direction = 1; + else if (pitch < -45) direction = 0; + else { int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; - switch (facing) - { - case 0: - direction = 2; - break; - - case 1: - direction = 5; - break; - - case 2: - direction = 3; - break; - - case 3: - direction = 4; - break; + switch (facing) { + case 0: + direction = 2; + break; + + case 1: + direction = 5; + break; + + case 2: + direction = 3; + break; + + case 3: + direction = 4; + break; } } } @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); direction = tags.getByte("Direction"); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); tags.setByte("Direction", direction); } /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } - public int comparatorStrength () - { + public int comparatorStrength() { CoordTuple master = this.getMasterPosition(); // invalid smeltery - if(master == null) - return 0; + if (master == null) return 0; SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(master.x, master.y, master.z); - // this can happen when the comparator checks its strength before the drain is getting updated on a broken master (smeltery controller) - if(smeltery == null) - return 0; + // this can happen when the comparator checks its strength before the drain is getting updated on a broken + // master (smeltery controller) + if (smeltery == null) return 0; - if(smeltery.maxLiquid == 0) - return 0; + if (smeltery.maxLiquid == 0) return 0; return 15 * smeltery.currentLiquid / smeltery.maxLiquid; } } diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index bab4acdecfb..438241eb5b9 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -1,11 +1,10 @@ package tconstruct.smeltery.logic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.abstracts.InventoryLogic; import mantle.blocks.abstracts.MultiServantLogic; import mantle.blocks.iface.IActiveLogic; @@ -32,7 +31,6 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -48,10 +46,9 @@ /* Simple class for storing items in the block */ -public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFacingLogic, IFluidTank, IMasterLogic -{ +public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFacingLogic, IFluidTank, IMasterLogic { private static final int MAX_SMELTERY_SIZE = 7; - public static final int MB_PER_BLOCK_CAPACITY = TConstruct.ingotLiquidValue*10; + public static final int MB_PER_BLOCK_CAPACITY = TConstruct.ingotLiquidValue * 10; public boolean validStructure; public boolean tempValidStructure; @@ -82,35 +79,29 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci Random rand = new Random(); boolean needsUpdate; - public SmelteryLogic() - { + public SmelteryLogic() { super(0); lavaTanks = new ArrayList(); activeTemps = new int[0]; meltingTemps = new int[0]; } - public int getBlocksPerLayer () - { + public int getBlocksPerLayer() { int xd = maxPos.x - minPos.x + 1; int zd = maxPos.z - minPos.z + 1; return xd * zd; } - public int getCapacityPerLayer () - { + public int getCapacityPerLayer() { return getBlocksPerLayer() * MB_PER_BLOCK_CAPACITY; } - public int getBlockCapacity () - { + public int getBlockCapacity() { return maxBlockCapacity; } - void adjustLayers (int lay, boolean forceAdjust) - { - if (lay != layers || forceAdjust) - { + void adjustLayers(int lay, boolean forceAdjust) { + if (lay != layers || forceAdjust) { needsUpdate = true; layers = lay; maxBlockCapacity = getBlocksPerLayer() * layers; @@ -131,59 +122,56 @@ void adjustLayers (int lay, boolean forceAdjust) int invLength = tempInv.length > inventory.length ? inventory.length : tempInv.length; System.arraycopy(tempInv, 0, inventory, 0, invLength); - if (activeTemps.length > 0 && activeTemps.length > tempActive.length) - { - for (int i = tempActive.length; i < activeTemps.length; i++) - { + if (activeTemps.length > 0 && activeTemps.length > tempActive.length) { + for (int i = tempActive.length; i < activeTemps.length; i++) { activeTemps[i] = 200; meltingTemps[i] = 200; } } - if (tempInv.length > inventory.length) - { - for (int i = inventory.length; i < tempInv.length; i++) - { + if (tempInv.length > inventory.length) { + for (int i = inventory.length; i < tempInv.length; i++) { ItemStack stack = tempInv[i]; - if (stack != null) - { + if (stack != null) { float jumpX = rand.nextFloat() * 0.8F + 0.1F; float jumpY = rand.nextFloat() * 0.8F + 0.1F; float jumpZ = rand.nextFloat() * 0.8F + 0.1F; int offsetX = 0; int offsetZ = 0; - switch (getRenderDirection()) - { - case 2: // +z - offsetZ = -1; - break; - case 3: // -z - offsetZ = 1; - break; - case 4: // +x - offsetX = -1; - break; - case 5: // -x - offsetX = 1; - break; + switch (getRenderDirection()) { + case 2: // +z + offsetZ = -1; + break; + case 3: // -z + offsetZ = 1; + break; + case 4: // +x + offsetX = -1; + break; + case 5: // -x + offsetX = 1; + break; } - while (stack.stackSize > 0) - { + while (stack.stackSize > 0) { int itemSize = rand.nextInt(21) + 10; - if (itemSize > stack.stackSize) - { + if (itemSize > stack.stackSize) { itemSize = stack.stackSize; } stack.stackSize -= itemSize; - EntityItem entityitem = new EntityItem(worldObj, (double) ((float) xCoord + jumpX + offsetX), (double) ((float) yCoord + jumpY), (double) ((float) zCoord + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); - - if (stack.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + EntityItem entityitem = new EntityItem( + worldObj, + (double) ((float) xCoord + jumpX + offsetX), + (double) ((float) yCoord + jumpY), + (double) ((float) zCoord + jumpZ + offsetZ), + new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); + + if (stack.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) + stack.getTagCompound().copy()); } float offset = 0.05F; @@ -203,104 +191,85 @@ void adjustLayers (int lay, boolean forceAdjust) /* Misc */ @Override - public String getDefaultName () - { + public String getDefaultName() { return "crafters.Smeltery"; } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new SmelteryContainer(inventoryplayer, this); } @Override - public byte getRenderDirection () - { + public byte getRenderDirection() { return direction; } @Override - public ForgeDirection getForgeDirection () - { + public ForgeDirection getForgeDirection() { return ForgeDirection.VALID_DIRECTIONS[direction]; } @Override - public void setDirection (int side) - { - - } + public void setDirection(int side) {} @Override - public void setDirection (float yaw, float pitch, EntityLivingBase player) - { + public void setDirection(float yaw, float pitch, EntityLivingBase player) { int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; - switch (facing) - { - case 0: - direction = 2; - break; + switch (facing) { + case 0: + direction = 2; + break; - case 1: - direction = 5; - break; + case 1: + direction = 5; + break; - case 2: - direction = 3; - break; + case 2: + direction = 3; + break; - case 3: - direction = 4; - break; + case 3: + direction = 4; + break; } } @Override - public boolean getActive () - { + public boolean getActive() { return validStructure; } @Override - public void setActive (boolean flag) - { + public void setActive(boolean flag) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } - public int getScaledFuelGague (int scale) - { + public int getScaledFuelGague(int scale) { int ret = (fuelGague * scale) / 52; - if (ret < 1) - ret = 1; + if (ret < 1) ret = 1; return ret; } - public int getInternalTemperature () - { - if (!validStructure) - return 20; + public int getInternalTemperature() { + if (!validStructure) return 20; return internalTemp; } - public int getTempForSlot (int slot) - { + public int getTempForSlot(int slot) { return activeTemps[slot] / 10; } - public int getMeltingPointForSlot (int slot) - { + public int getMeltingPointForSlot(int slot) { return meltingTemps[slot] / 10; } /* Updating */ @Override - public void updateEntity () - { + public void updateEntity() { tick++; - if (tick == 60) - { + if (tick == 60) { tick = 0; detectEntities(); } @@ -309,124 +278,96 @@ public void updateEntity () * if (worldObj.isRemote) return; */ - if (tick % 4 == 0) { - if (useTime > 0) - useTime -= 4; + if (useTime > 0) useTime -= 4; - if(validStructure) { + if (validStructure) { checkHasItems(); // consume fuel if needed - if(useTime <= 0 && inUse) - updateFuelGague(); + if (useTime <= 0 && inUse) updateFuelGague(); heatItems(); } } - if (tick % 20 == 0) - { - if (!validStructure) - checkValidPlacement(); + if (tick % 20 == 0) { + if (!validStructure) checkValidPlacement(); - if (needsUpdate) - { + if (needsUpdate) { needsUpdate = false; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } } - void detectEntities () - { - if (minPos == null || maxPos == null) - return; + void detectEntities() { + if (minPos == null || maxPos == null) return; - AxisAlignedBB box = AxisAlignedBB.getBoundingBox(minPos.x, minPos.y, minPos.z, maxPos.x + 1, minPos.y + layers, maxPos.z + 1); + AxisAlignedBB box = AxisAlignedBB.getBoundingBox( + minPos.x, minPos.y, minPos.z, maxPos.x + 1, minPos.y + layers, maxPos.z + 1); List list = worldObj.getEntitiesWithinAABB(Entity.class, box); - for (Entity o : list) - { - if (o.isDead) - return; + for (Entity o : list) { + if (o.isDead) return; - if (moltenMetal.size() >= 1) - { + if (moltenMetal.size() >= 1) { Fluid fluid = null; int amount = 0; float damage = 5; - if (o instanceof EntityVillager && PHConstruct.meltableVillagers) - { + if (o instanceof EntityVillager && PHConstruct.meltableVillagers) { EntityVillager villager = (EntityVillager) o; fluid = TinkerSmeltery.moltenEmeraldFluid; amount = villager.isChild() ? 5 : 40; - } - else if (o instanceof EntityEnderman) - { + } else if (o instanceof EntityEnderman) { fluid = TinkerSmeltery.moltenEnderFluid; amount = 125; - } - else if (o instanceof EntityIronGolem) - { + } else if (o instanceof EntityIronGolem) { fluid = TinkerSmeltery.moltenIronFluid; amount = 40; - } - else if (o instanceof EntityHorse && PHConstruct.meltableHorses) - { + } else if (o instanceof EntityHorse && PHConstruct.meltableHorses) { fluid = TinkerSmeltery.glueFluid; amount = 108; - } - else if (o instanceof EntityLivingBase) - { + } else if (o instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) o; fluid = TinkerSmeltery.bloodFluid; amount = living.isChild() || living instanceof EntityPlayer ? 5 : 40; } - if (fluid != null && amount > 0 && damage > 0) - { + if (fluid != null && amount > 0 && damage > 0) { boolean canFill = o.attackEntityFrom(new SmelteryDamageSource(), damage); - if (canFill && amount > 0) - this.fill(new FluidStack(fluid, amount), true); + if (canFill && amount > 0) this.fill(new FluidStack(fluid, amount), true); } - } - else if (PHConstruct.throwableSmeltery && o instanceof EntityItem) - { + } else if (PHConstruct.throwableSmeltery && o instanceof EntityItem) { handleItemEntity((EntityItem) o); } } } - private void handleItemEntity (EntityItem item) - { + private void handleItemEntity(EntityItem item) { // Clients like to play merry hell with this and cause breakage (we // update their inv on syncs) - if (worldObj.isRemote) - return; + if (worldObj.isRemote) return; item.age = 0; ItemStack istack = item.getEntityItem(); if (istack == null || istack.stackSize <= 0) // Probably most definitely - // not necessary + // not necessary return; int maxSlot = this.getSizeInventory(); boolean itemDestroyed = false; boolean itemAdded = false; - for (int i = 0; i < maxSlot; i++) - { + for (int i = 0; i < maxSlot; i++) { ItemStack stack = this.getStackInSlot(i); - if (stack == null && istack.stackSize > 0) - { + if (stack == null && istack.stackSize > 0) { ItemStack copy = istack.splitStack(1); this.setInventorySlotContents(i, copy); itemAdded = true; - if (istack.stackSize <= 0) - { + if (istack.stackSize <= 0) { item.setDead(); itemDestroyed = true; break; @@ -434,58 +375,43 @@ private void handleItemEntity (EntityItem item) } } - if (!itemDestroyed) - item.setEntityItemStack(istack); - if (itemAdded) - { + if (!itemDestroyed) item.setEntityItemStack(istack); + if (itemAdded) { this.needsUpdate = true; - //TODO 1.7.5 send description packet in better way to not cause render update + // TODO 1.7.5 send description packet in better way to not cause render update this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } } - private void checkHasItems() - { + private void checkHasItems() { inUse = false; for (int i = 0; i < maxBlockCapacity; i++) - if(this.isStackInSlot(i) && meltingTemps[i] > 200) - { + if (this.isStackInSlot(i) && meltingTemps[i] > 200) { inUse = true; break; } } - private void heatItems () - { - if (useTime > 0) - { + private void heatItems() { + if (useTime > 0) { boolean hasUse = false; int temperature = this.getInternalTemperature(); int speed = temperature / 100; int refTemp = temperature * 10; - for (int i = 0; i < maxBlockCapacity; i++) - { - if (meltingTemps[i] > 200 && this.isStackInSlot(i)) - { + for (int i = 0; i < maxBlockCapacity; i++) { + if (meltingTemps[i] > 200 && this.isStackInSlot(i)) { hasUse = true; - if (activeTemps[i] < refTemp && activeTemps[i] < meltingTemps[i]) - { + if (activeTemps[i] < refTemp && activeTemps[i] < meltingTemps[i]) { activeTemps[i] += speed; // lava has temp of 1000. we increase by 10 per application. - } - else if (activeTemps[i] >= meltingTemps[i]) - { - if (!worldObj.isRemote) - { + } else if (activeTemps[i] >= meltingTemps[i]) { + if (!worldObj.isRemote) { FluidStack result = getResultFor(inventory[i]); - if (result != null) - { - if (addMoltenMetal(result, false)) - { + if (result != null) { + if (addMoltenMetal(result, false)) { inventory[i] = null; activeTemps[i] = 200; ArrayList alloys = Smeltery.mixMetals(moltenMetal); - for (int al = 0; al < alloys.size(); al++) - { + for (int al = 0; al < alloys.size(); al++) { FluidStack liquid = (FluidStack) alloys.get(al); addMoltenMetal(liquid, true); } @@ -495,61 +421,46 @@ else if (activeTemps[i] >= meltingTemps[i]) } } - } - - else - activeTemps[i] = 200; + } else activeTemps[i] = 200; } inUse = hasUse; } } - boolean addMoltenMetal (FluidStack liquid, boolean first) - { + boolean addMoltenMetal(FluidStack liquid, boolean first) { needsUpdate = true; - if (moltenMetal.size() == 0) - { + if (moltenMetal.size() == 0) { // does it fit in? - if(liquid.amount > this.getCapacity()) - return false; + if (liquid.amount > this.getCapacity()) return false; moltenMetal.add(liquid.copy()); updateCurrentLiquid(); return true; - } - else - { + } else { // update liquid amount.. updateCurrentLiquid(); - if (liquid.amount + currentLiquid > maxLiquid) - return false; + if (liquid.amount + currentLiquid > maxLiquid) return false; currentLiquid += liquid.amount; // TConstruct.logger.info("Current liquid: "+currentLiquid); boolean added = false; - for (int i = 0; i < moltenMetal.size(); i++) - { + for (int i = 0; i < moltenMetal.size(); i++) { FluidStack l = moltenMetal.get(i); // if (l.itemID == liquid.itemID && l.itemMeta == // liquid.itemMeta) - if (l.isFluidEqual(liquid)) - { + if (l.isFluidEqual(liquid)) { l.amount += liquid.amount; added = true; } - if (l.amount <= 0) - { + if (l.amount <= 0) { moltenMetal.remove(l); i--; } } - if (!added) - { - if (first) - moltenMetal.add(0, liquid.copy()); - else - moltenMetal.add(liquid.copy()); + if (!added) { + if (first) moltenMetal.add(0, liquid.copy()); + else moltenMetal.add(liquid.copy()); } return true; } @@ -557,20 +468,17 @@ boolean addMoltenMetal (FluidStack liquid, boolean first) private void updateCurrentLiquid() { currentLiquid = 0; - for(FluidStack liquid : moltenMetal) - currentLiquid += liquid.amount; + for (FluidStack liquid : moltenMetal) currentLiquid += liquid.amount; } - private void updateTemperatures () - { - for (int i = 0; i < maxBlockCapacity && i < meltingTemps.length; i++) - { - meltingTemps[i] = Smeltery.getLiquifyTemperature(inventory[i]) * 10; // temperatures are *10 for more progress control + private void updateTemperatures() { + for (int i = 0; i < maxBlockCapacity && i < meltingTemps.length; i++) { + meltingTemps[i] = + Smeltery.getLiquifyTemperature(inventory[i]) * 10; // temperatures are *10 for more progress control } } - public void updateFuelDisplay () - { + public void updateFuelDisplay() { // ensure our active tank is valid verifyFuelTank(); if (activeLavaTank == null) { @@ -580,28 +488,27 @@ public void updateFuelDisplay () } // checks are all done before in verifyFuelTank. Don't do this without checks! - IFluidHandler tankContainer = (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + IFluidHandler tankContainer = + (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); FluidTankInfo[] info = tankContainer.getTankInfo(ForgeDirection.DOWN); int capacity = info[0].capacity; fuelAmount = info[0].fluid.amount; - fuelGague = (int)((float)fuelAmount * 52f / (float)capacity); + fuelGague = (int) ((float) fuelAmount * 52f / (float) capacity); } // actually is updateFuel. - public void updateFuelGague () - { + public void updateFuelGague() { // no need to update - if(useTime > 0 || !inUse) - return; + if (useTime > 0 || !inUse) return; // ensure active lava tank verifyFuelTank(); - if (activeLavaTank == null) - return; + if (activeLavaTank == null) return; // checks are all done before in verifyFuelTank. Don't do this without checks! - IFluidHandler tankContainer = (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + IFluidHandler tankContainer = + (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); // get liquid from the tank FluidStack liquid = tankContainer.drain(ForgeDirection.DOWN, 15, false); @@ -611,66 +518,57 @@ public void updateFuelGague () // drain actual liquid, non simulated liquid = tankContainer.drain(ForgeDirection.DOWN, 15, true); // we try to do it as long as we don't have enough. Only needed for rapid-use fuels. - if(liquid == null || liquid.amount == 0) - break; - useTime += (int) ((float) Smeltery.getFuelDuration(liquid.getFluid()) * Math.round(15f / (float) liquid.amount)); + if (liquid == null || liquid.amount == 0) break; + useTime += (int) + ((float) Smeltery.getFuelDuration(liquid.getFluid()) * Math.round(15f / (float) liquid.amount)); internalTemp = Smeltery.getFuelPower(liquid.getFluid()); - } while(useTime < 0); + } while (useTime < 0); // update fuel display - updateFuelDisplay(); // this also ensures that the next fuel tank is displayed if this drain made the current one empty + updateFuelDisplay(); // this also ensures that the next fuel tank is displayed if this drain made the + // current one empty } } - protected void verifyFuelTank() - { + protected void verifyFuelTank() { // is our current tank still good? - if(activeLavaTank != null && worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) - { + if (activeLavaTank != null && worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) { TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); - if (tankContainer instanceof IFluidHandler) - { + if (tankContainer instanceof IFluidHandler) { FluidStack liquid = ((IFluidHandler) tankContainer).drain(ForgeDirection.DOWN, 15, false); // current tank still has liquid and it's a fuel. everythin ok. - if (liquid != null && Smeltery.isSmelteryFuel(liquid.getFluid())) - return; + if (liquid != null && Smeltery.isSmelteryFuel(liquid.getFluid())) return; } } - // our tank got derped or is empty. time to look for a new one! activeLavaTank = null; - for(CoordTuple tank : lavaTanks) - { + for (CoordTuple tank : lavaTanks) { // does the tank still exist? - if (!worldObj.blockExists(tank.x, tank.y, tank.z)) - continue; + if (!worldObj.blockExists(tank.x, tank.y, tank.z)) continue; // yes, it does, but is it a tank? TileEntity tankContainer = worldObj.getTileEntity(tank.x, tank.y, tank.z); - if (! (tankContainer instanceof IFluidHandler)) - continue; + if (!(tankContainer instanceof IFluidHandler)) continue; // yes it is, but does it contain a liquid? FluidTankInfo[] info = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN); - if(info.length <= 0 || info[0].fluid == null || info[0].fluid.amount <= 0) - continue; + if (info.length <= 0 || info[0].fluid == null || info[0].fluid.amount <= 0) continue; // is it also a smeltery fuel? - if(!Smeltery.isSmelteryFuel(info[0].fluid.getFluid())) - continue; + if (!Smeltery.isSmelteryFuel(info[0].fluid.getFluid())) continue; // we found a tank! :) activeLavaTank = tank; return; } - // possibly assign default empty tank here (tanks.get(0)) so we don't have a null activeLavaTank if all are empty + // possibly assign default empty tank here (tanks.get(0)) so we don't have a null activeLavaTank if all are + // empty } @SideOnly(Side.CLIENT) - public FluidStack getFuel() - { + public FluidStack getFuel() { if (activeLavaTank == null) // sane default return new FluidStack(FluidRegistry.LAVA, 0); @@ -682,8 +580,7 @@ public FluidStack getFuel() return new FluidStack(FluidRegistry.LAVA, 0); } - public FluidStack getResultFor (ItemStack stack) - { + public FluidStack getResultFor(ItemStack stack) { return Smeltery.getSmelteryResult(stack); } @@ -695,14 +592,12 @@ public FluidStack getResultFor (ItemStack stack) */ @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 1; } @Override - public void markDirty () - { + public void markDirty() { updateTemperatures(); updateEntity(); @@ -721,33 +616,29 @@ public void markDirty () /* Multiblock */ @Override - public void notifyChange (IServantLogic servant, int x, int y, int z) - { + public void notifyChange(IServantLogic servant, int x, int y, int z) { checkValidPlacement(); } - public void checkValidPlacement () - { - switch (getRenderDirection()) - { - case 2: // +z - alignInitialPlacement(xCoord, yCoord, zCoord + 1); - break; - case 3: // -z - alignInitialPlacement(xCoord, yCoord, zCoord - 1); - break; - case 4: // +x - alignInitialPlacement(xCoord + 1, yCoord, zCoord); - break; - case 5: // -x - alignInitialPlacement(xCoord - 1, yCoord, zCoord); - break; + public void checkValidPlacement() { + switch (getRenderDirection()) { + case 2: // +z + alignInitialPlacement(xCoord, yCoord, zCoord + 1); + break; + case 3: // -z + alignInitialPlacement(xCoord, yCoord, zCoord - 1); + break; + case 4: // +x + alignInitialPlacement(xCoord + 1, yCoord, zCoord); + break; + case 5: // -x + alignInitialPlacement(xCoord - 1, yCoord, zCoord); + break; } } // aligns the position given (inside the smeltery) to be the center of the smeltery - public void alignInitialPlacement (int x, int y, int z) - { + public void alignInitialPlacement(int x, int y, int z) { // x/y/z = the block behind the controller "inside the smeltery" // adjust the x-position of the block until the difference between the outer walls is at most 1 @@ -755,22 +646,18 @@ public void alignInitialPlacement (int x, int y, int z) int xd1 = 1, xd2 = 1; // x-difference for (int i = 1; i < MAX_SMELTERY_SIZE; i++) // don't check farther than needed { - if (this.worldObj.isAirBlock(x - xd1, y, z)) - xd1++; - else if (this.worldObj.isAirBlock(x + xd2, y, z)) - xd2++; + if (this.worldObj.isAirBlock(x - xd1, y, z)) xd1++; + else if (this.worldObj.isAirBlock(x + xd2, y, z)) xd2++; // if one side hit a wall and the other didn't we might have to center our x-position again - if (xd1 - xd2 > 1) - { + if (xd1 - xd2 > 1) { // move x and offsets to the -x xd1--; x--; xd2++; } // or the right - if (xd2 - xd1 > 1) - { + if (xd2 - xd1 > 1) { xd2--; x++; xd1++; @@ -780,22 +667,18 @@ else if (this.worldObj.isAirBlock(x + xd2, y, z)) int zd1 = 1, zd2 = 1; for (int i = 1; i < MAX_SMELTERY_SIZE; i++) // don't check farther than needed { - if (this.worldObj.isAirBlock(x, y, z - zd1)) - zd1++; - else if (this.worldObj.isAirBlock(x, y, z + zd2)) - zd2++; + if (this.worldObj.isAirBlock(x, y, z - zd1)) zd1++; + else if (this.worldObj.isAirBlock(x, y, z + zd2)) zd2++; // if one side hit a wall and the other didn't we might have to center our x-position again - if (zd1 - zd2 > 1) - { + if (zd1 - zd2 > 1) { // move x and offsets to the -x zd1--; z--; zd2++; } // or the right - if (zd2 - zd1 > 1) - { + if (zd2 - zd1 > 1) { zd2--; z++; zd1++; @@ -803,7 +686,7 @@ else if (this.worldObj.isAirBlock(x, y, z + zd2)) } // do the check - int[] sides = new int[] { xd1, xd2, zd1, zd2 }; + int[] sides = new int[] {xd1, xd2, zd1, zd2}; checkValidStructure(x, y, z, sides); } @@ -814,16 +697,14 @@ else if (this.worldObj.isAirBlock(x, y, z + zd2)) * @param z z-center of the smeltery +-1 * @param sides distance between the center point and the wall. [-x,+x,-z,+z] */ - public void checkValidStructure (int x, int y, int z, int[] sides) - { + public void checkValidStructure(int x, int y, int z, int[] sides) { int checkLayers = 0; - //worldObj.setBlock(x,y,z, Blocks.redstone_block); - //worldObj.setBlock(x+sides[1]-sides[0],y+1,z+sides[3]-sides[2], Blocks.lapis_block); + // worldObj.setBlock(x,y,z, Blocks.redstone_block); + // worldObj.setBlock(x+sides[1]-sides[0],y+1,z+sides[3]-sides[2], Blocks.lapis_block); tempValidStructure = false; // this piece of code here does the complete validity check. - if (checkSameLevel(x, y, z, sides)) - { + if (checkSameLevel(x, y, z, sides)) { checkLayers++; checkLayers += recurseStructureUp(x, y + 1, z, sides, 0); checkLayers += recurseStructureDown(x, y - 1, z, sides, 0); @@ -831,23 +712,17 @@ public void checkValidStructure (int x, int y, int z, int[] sides) // maxLiquid = capacity * 20000; - if (tempValidStructure != validStructure || checkLayers != this.layers) - { - if (tempValidStructure) - { + if (tempValidStructure != validStructure || checkLayers != this.layers) { + if (tempValidStructure) { // try to derive temperature from fueltank activeLavaTank = null; - for (CoordTuple tank : lavaTanks) - { + for (CoordTuple tank : lavaTanks) { TileEntity tankContainer = worldObj.getTileEntity(tank.x, tank.y, tank.z); - if (!(tankContainer instanceof IFluidHandler)) - continue; + if (!(tankContainer instanceof IFluidHandler)) continue; FluidStack liquid = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN)[0].fluid; - if (liquid == null) - continue; - if (!Smeltery.isSmelteryFuel(liquid.getFluid())) - continue; + if (liquid == null) continue; + if (!Smeltery.isSmelteryFuel(liquid.getFluid())) continue; internalTemp = Smeltery.getFuelPower(liquid.getFluid()); activeLavaTank = tank; @@ -855,26 +730,21 @@ public void checkValidStructure (int x, int y, int z, int[] sides) } // no tank with fuel. we reserve the first found one - if (activeLavaTank == null) - activeLavaTank = lavaTanks.get(0); + if (activeLavaTank == null) activeLavaTank = lavaTanks.get(0); // update other stuff adjustLayers(checkLayers, true); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); validStructure = true; - } - else - { + } else { internalTemp = 20; - if(validStructure) - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + if (validStructure) worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); validStructure = false; } } } - public boolean checkBricksOnLevel (int x, int y, int z, int[] sides) - { + public boolean checkBricksOnLevel(int x, int y, int z, int[] sides) { int numBricks = 0; Block block; int xMin = x - sides[0]; @@ -883,26 +753,21 @@ public boolean checkBricksOnLevel (int x, int y, int z, int[] sides) int zMax = z + sides[3]; // Check inside - for (int xPos = xMin + 1; xPos <= xMax - 1; xPos++) - { - for (int zPos = zMin + 1; zPos <= zMax - 1; zPos++) - { - if (!this.worldObj.isAirBlock(xPos, y, zPos)) - { + for (int xPos = xMin + 1; xPos <= xMax - 1; xPos++) { + for (int zPos = zMin + 1; zPos <= zMax - 1; zPos++) { + if (!this.worldObj.isAirBlock(xPos, y, zPos)) { return false; } } } // Check outer layer - for (int xPos = xMin + 1; xPos <= xMax - 1; xPos++) - { + for (int xPos = xMin + 1; xPos <= xMax - 1; xPos++) { numBricks += checkBricks(xPos, y, zMin); numBricks += checkBricks(xPos, y, zMax); } - for (int zPos = zMin + 1; zPos <= zMax - 1; zPos++) - { + for (int zPos = zMin + 1; zPos <= zMax - 1; zPos++) { numBricks += checkBricks(xMin, y, zPos); numBricks += checkBricks(xMax, y, zPos); } @@ -912,40 +777,32 @@ public boolean checkBricksOnLevel (int x, int y, int z, int[] sides) return numBricks == neededBricks; } - public boolean checkSameLevel (int x, int y, int z, int[] sides) - { + public boolean checkSameLevel(int x, int y, int z, int[] sides) { lavaTanks.clear(); boolean check = checkBricksOnLevel(x, y, z, sides); - if (check && lavaTanks.size() > 0) - return true; - else - return false; + if (check && lavaTanks.size() > 0) return true; + else return false; } - public int recurseStructureUp (int x, int y, int z, int[] sides, int count) - { + public int recurseStructureUp(int x, int y, int z, int[] sides, int count) { boolean check = checkBricksOnLevel(x, y, z, sides); - if (!check) - return count; + if (!check) return count; count++; return recurseStructureUp(x, y + 1, z, sides, count); } - public int recurseStructureDown (int x, int y, int z, int[] sides, int count) - { + public int recurseStructureDown(int x, int y, int z, int[] sides, int count) { boolean check = checkBricksOnLevel(x, y, z, sides); - if (!check) - { + if (!check) { // regular check failed, maybe it's the bottom? Block block = worldObj.getBlock(x, y, z); if (!block.isAir(this.worldObj, x, y, z)) - if (validBlockID(block)) - return validateBottom(x, y, z, sides, count); + if (validBlockID(block)) return validateBottom(x, y, z, sides, count); return count; } @@ -954,8 +811,7 @@ public int recurseStructureDown (int x, int y, int z, int[] sides, int count) return recurseStructureDown(x, y - 1, z, sides, count); } - public int validateBottom (int x, int y, int z, int[] sides, int count) - { + public int validateBottom(int x, int y, int z, int[] sides, int count) { int bottomBricks = 0; int xMin = x - sides[0] + 1; int xMax = x + sides[1] - 1; @@ -964,13 +820,10 @@ public int validateBottom (int x, int y, int z, int[] sides, int count) // Check inside if (y >= 0 && y < 256) { - for (int xPos = xMin; xPos <= xMax; xPos++) - { - for (int zPos = zMin; zPos <= zMax; zPos++) - { + for (int xPos = xMin; xPos <= xMax; xPos++) { + for (int zPos = zMin; zPos <= zMax; zPos++) { Chunk chunk = this.worldObj.getChunkFromBlockCoords(xPos, zPos); - if (chunk == null) - continue; + if (chunk == null) continue; int xx = xPos & 15; int zz = zPos & 15; @@ -994,8 +847,7 @@ public int validateBottom (int x, int y, int z, int[] sides, int count) int neededBricks = (xMax + 1 - xMin) * (zMax + 1 - zMin); // +1 because we want inclusive the upper bound - if (bottomBricks == neededBricks) - { + if (bottomBricks == neededBricks) { tempValidStructure = true; minPos = new CoordTuple(xMin, y + 1, zMin); maxPos = new CoordTuple(xMax, y + 1, zMax); @@ -1007,34 +859,24 @@ public int validateBottom (int x, int y, int z, int[] sides, int count) * Returns whether the brick is a lava tank or not. Increments bricks, sets * them as part of the structure, and adds tanks to the list. */ - int checkBricks (int x, int y, int z) - { + int checkBricks(int x, int y, int z) { int tempBricks = 0; Block blockID = worldObj.getBlock(x, y, z); - if (validBlockID(blockID) || validTankID(blockID)) - { + if (validBlockID(blockID) || validTankID(blockID)) { TileEntity te = worldObj.getTileEntity(x, y, z); - if (te == this) - { + if (te == this) { tempBricks++; - } - else if (te instanceof MultiServantLogic) - { + } else if (te instanceof MultiServantLogic) { MultiServantLogic servant = (MultiServantLogic) te; - if (servant.hasValidMaster()) - { - if (servant.verifyMaster(this, worldObj, this.xCoord, this.yCoord, this.zCoord)) - tempBricks++; - } - else - { + if (servant.hasValidMaster()) { + if (servant.verifyMaster(this, worldObj, this.xCoord, this.yCoord, this.zCoord)) tempBricks++; + } else { servant.overrideMaster(this.xCoord, this.yCoord, this.zCoord); tempBricks++; } - if (te instanceof LavaTankLogic) - { + if (te instanceof LavaTankLogic) { lavaTanks.add(new CoordTuple(x, y, z)); } } @@ -1042,45 +884,35 @@ else if (te instanceof MultiServantLogic) return tempBricks; } - boolean validBlockID (Block blockID) - { + boolean validBlockID(Block blockID) { return blockID == TinkerSmeltery.smeltery || blockID == TinkerSmeltery.smelteryNether; } - boolean validTankID (Block blockID) - { + boolean validTankID(Block blockID) { return blockID == TinkerSmeltery.lavaTank || blockID == TinkerSmeltery.lavaTankNether; } @Override - public int getCapacity () - { + public int getCapacity() { return maxLiquid; } - public int getTotalLiquid () - { + public int getTotalLiquid() { return currentLiquid; } @Override - public FluidStack drain (int maxDrain, boolean doDrain) - { + public FluidStack drain(int maxDrain, boolean doDrain) { // don't drain if we're not complete - if(!validStructure) - return null; + if (!validStructure) return null; - if (moltenMetal.size() == 0) - return null; + if (moltenMetal.size() == 0) return null; FluidStack liquid = moltenMetal.get(0); - if (liquid != null) - { - if (liquid.amount - maxDrain <= 0) - { + if (liquid != null) { + if (liquid.amount - maxDrain <= 0) { FluidStack liq = liquid.copy(); - if (doDrain) - { + if (doDrain) { // liquid = null; moltenMetal.remove(liquid); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -1088,11 +920,8 @@ public FluidStack drain (int maxDrain, boolean doDrain) updateCurrentLiquid(); } return liq; - } - else - { - if (doDrain && maxDrain > 0) - { + } else { + if (doDrain && maxDrain > 0) { liquid.amount -= maxDrain; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); currentLiquid -= maxDrain; @@ -1100,35 +929,27 @@ public FluidStack drain (int maxDrain, boolean doDrain) } return new FluidStack(liquid.getFluid(), maxDrain, liquid.tag); } - } - else - { + } else { return new FluidStack(0, 0); } } @Override - public int fill (FluidStack resource, boolean doFill) - { + public int fill(FluidStack resource, boolean doFill) { // don't fill if we're not complete - if(!validStructure) - return 0; + if (!validStructure) return 0; - if (resource != null && currentLiquid < maxLiquid)// resource.amount + - // currentLiquid < - // maxLiquid) + if (resource != null && currentLiquid < maxLiquid) // resource.amount + + // currentLiquid < + // maxLiquid) { - if (resource.amount + currentLiquid > maxLiquid) - resource.amount = maxLiquid - currentLiquid; + if (resource.amount + currentLiquid > maxLiquid) resource.amount = maxLiquid - currentLiquid; int amount = resource.amount; - if (amount > 0 && doFill) - { - if (addMoltenMetal(resource, false)) - { + if (amount > 0 && doFill) { + if (addMoltenMetal(resource, false)) { ArrayList alloys = Smeltery.mixMetals(moltenMetal); - for (int al = 0; al < alloys.size(); al++) - { + for (int al = 0; al < alloys.size(); al++) { FluidStack liquid = (FluidStack) alloys.get(al); addMoltenMetal(liquid, true); } @@ -1137,36 +958,28 @@ public int fill (FluidStack resource, boolean doFill) worldObj.func_147479_m(xCoord, yCoord, zCoord); } return amount; - } - else - return 0; + } else return 0; } @Override - public FluidStack getFluid () - { - if (moltenMetal.size() == 0) - return null; + public FluidStack getFluid() { + if (moltenMetal.size() == 0) return null; return moltenMetal.get(0); } @Override - public int getFluidAmount () - { + public int getFluidAmount() { return currentLiquid; } @Override - public FluidTankInfo getInfo () - { + public FluidTankInfo getInfo() { return new FluidTankInfo(this); } - public FluidTankInfo[] getMultiTankInfo () - { + public FluidTankInfo[] getMultiTankInfo() { FluidTankInfo[] info = new FluidTankInfo[moltenMetal.size() + 1]; - for (int i = 0; i < moltenMetal.size(); i++) - { + for (int i = 0; i < moltenMetal.size(); i++) { FluidStack fluid = moltenMetal.get(i); info[i] = new FluidTankInfo(fluid.copy(), fluid.amount); } @@ -1177,20 +990,15 @@ public FluidTankInfo[] getMultiTankInfo () /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { layers = tags.getInteger("Layers"); int[] pos = tags.getIntArray("MinPos"); - if (pos.length > 2) - minPos = new CoordTuple(pos[0], pos[1], pos[2]); - else - minPos = new CoordTuple(xCoord, yCoord, zCoord); + if (pos.length > 2) minPos = new CoordTuple(pos[0], pos[1], pos[2]); + else minPos = new CoordTuple(xCoord, yCoord, zCoord); pos = tags.getIntArray("MaxPos"); - if (pos.length > 2) - maxPos = new CoordTuple(pos[0], pos[1], pos[2]); - else - maxPos = new CoordTuple(xCoord, yCoord, zCoord); + if (pos.length > 2) maxPos = new CoordTuple(pos[0], pos[1], pos[2]); + else maxPos = new CoordTuple(xCoord, yCoord, zCoord); maxBlockCapacity = getBlocksPerLayer() * layers; inventory = new ItemStack[maxBlockCapacity]; @@ -1209,20 +1017,21 @@ public void readFromNBT (NBTTagCompound tags) NBTTagList liquidTag = tags.getTagList("Liquids", 10); moltenMetal.clear(); - for (int iter = 0; iter < liquidTag.tagCount(); iter++) - { + for (int iter = 0; iter < liquidTag.tagCount(); iter++) { NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); - if (fluid != null) - moltenMetal.add(fluid); + if (fluid != null) moltenMetal.add(fluid); } - //if(maxBlockCapacity != meltingTemps.length) - // adjustLayers(layers, true); + // if(maxBlockCapacity != meltingTemps.length) + // adjustLayers(layers, true); - if(!tags.getBoolean("ValidStructure")) + if (!tags.getBoolean("ValidStructure")) validStructure = false; // only negative update because we want to do a clientside structure check too - else if(!validStructure && worldObj != null) // if the worldobj is null it happens on loading of a world. check shouldn't be done there + else if (!validStructure + && worldObj + != null) // if the worldobj is null it happens on loading of a world. check shouldn't be done + // there checkValidPlacement(); // adjustLayers(layers, true); @@ -1230,8 +1039,7 @@ else if(!validStructure && worldObj != null) // if the worldobj is null it happe } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); tags.setBoolean("ValidStructure", validStructure); @@ -1239,16 +1047,12 @@ public void writeToNBT (NBTTagCompound tags) tags.setBoolean("InUse", inUse); int[] pos; - if (minPos == null) - pos = new int[] { xCoord, yCoord, zCoord }; - else - pos = new int[] { minPos.x, minPos.y, minPos.z }; + if (minPos == null) pos = new int[] {xCoord, yCoord, zCoord}; + else pos = new int[] {minPos.x, minPos.y, minPos.z}; tags.setIntArray("MinPos", pos); - if (maxPos == null) - pos = new int[] { xCoord, yCoord, zCoord }; - else - pos = new int[] { maxPos.x, maxPos.y, maxPos.z }; + if (maxPos == null) pos = new int[] {xCoord, yCoord, zCoord}; + else pos = new int[] {maxPos.x, maxPos.y, maxPos.z}; tags.setIntArray("MaxPos", pos); tags.setByte("Direction", direction); @@ -1260,8 +1064,7 @@ public void writeToNBT (NBTTagCompound tags) tags.setIntArray("ActiveTemps", activeTemps); NBTTagList taglist = new NBTTagList(); - for (FluidStack liquid : moltenMetal) - { + for (FluidStack liquid : moltenMetal) { NBTTagCompound nbt = new NBTTagCompound(); liquid.writeToNBT(nbt); taglist.appendTag(nbt); @@ -1272,16 +1075,14 @@ public void writeToNBT (NBTTagCompound tags) /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeToNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); markDirty(); worldObj.func_147479_m(xCoord, yCoord, zCoord); @@ -1289,24 +1090,18 @@ public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) } @Override - public String getInventoryName () - { + public String getInventoryName() { return getDefaultName(); } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return true; } @Override - public void closeInventory () - { - } + public void closeInventory() {} @Override - public void openInventory () - { - } + public void openInventory() {} } diff --git a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java index 9d84c1d2f8b..afad3a4dba2 100644 --- a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java @@ -14,55 +14,50 @@ /** * @author BluSunrize */ - -public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler -{ +public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { public static int renderID = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - //Floor + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + // Floor renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); this.renderStandardBlock(block, metadata, renderer); - //Channel Z- + // Channel Z- renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); this.renderStandardBlock(block, metadata, renderer); renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); this.renderStandardBlock(block, metadata, renderer); renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); this.renderStandardBlock(block, metadata, renderer); - //Channel Z+ + // Channel Z+ renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); this.renderStandardBlock(block, metadata, renderer); renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); this.renderStandardBlock(block, metadata, renderer); renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); this.renderStandardBlock(block, metadata, renderer); - //Wall X- + // Wall X- renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D); this.renderStandardBlock(block, metadata, renderer); - //Wall X+ + // Wall X+ renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D); this.renderStandardBlock(block, metadata, renderer); } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == renderID) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == renderID) { CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); Set outputs = tile.getOutputs().keySet(); - if (!outputs.contains(ForgeDirection.DOWN))//CentrePiece, floor is removed if tank below is found + if (!outputs.contains(ForgeDirection.DOWN)) // CentrePiece, floor is removed if tank below is found { renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); - } - else - //"Guiding Borders" when tank below is found + } else + // "Guiding Borders" when tank below is found { renderer.setRenderBounds(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D); renderer.renderStandardBlock(block, x, y, z); @@ -73,7 +68,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.setRenderBounds(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); } - if (outputs.contains(ForgeDirection.NORTH))//Channel to Z- + if (outputs.contains(ForgeDirection.NORTH)) // Channel to Z- { renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); renderer.renderStandardBlock(block, x, y, z); @@ -81,15 +76,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); renderer.renderStandardBlock(block, x, y, z); - } - else - //Wall to Z- + } else + // Wall to Z- { renderer.setRenderBounds(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D); renderer.renderStandardBlock(block, x, y, z); } - if (outputs.contains(ForgeDirection.SOUTH))//Channel to Z+ + if (outputs.contains(ForgeDirection.SOUTH)) // Channel to Z+ { renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); renderer.renderStandardBlock(block, x, y, z); @@ -97,15 +91,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); renderer.renderStandardBlock(block, x, y, z); - } - else - //Wall to Z+ + } else + // Wall to Z+ { renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); } - if (outputs.contains(ForgeDirection.WEST))//Channel to X- + if (outputs.contains(ForgeDirection.WEST)) // Channel to X- { renderer.setRenderBounds(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); @@ -113,15 +106,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0D, 0.5D, 0.625D, 0.375D, 0.625D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); - } - else - //Wall to X- + } else + // Wall to X- { renderer.setRenderBounds(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); } - if (outputs.contains(ForgeDirection.EAST))//Channel to X+ + if (outputs.contains(ForgeDirection.EAST)) // Channel to X+ { renderer.setRenderBounds(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); @@ -129,29 +121,24 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.625D, 0.5D, 0.625D, 1D, 0.625D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); - } - else - //Wall to X+ + } else + // Wall to X+ { renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D); renderer.renderStandardBlock(block, x, y, z); } FluidTankInfo tankMain = tile.getTankInfo(null)[0]; - if (tankMain.fluid != null) - { + if (tankMain.fluid != null) { float liquidAmount = (float) tankMain.fluid.amount / (float) tankMain.capacity * 0.125f; double startY = tile.tankBelow(); - renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.51 + liquidAmount, 0.625D); //Center + renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.51 + liquidAmount, 0.625D); // Center renderLiquidPart(world, x, y, z, block, renderer, tankMain.fluid, false); } - for (ForgeDirection dir : outputs) - { + for (ForgeDirection dir : outputs) { double[] bounds = getRenderboundsForLiquid(dir); - if (bounds == null) - break; + if (bounds == null) break; FluidTankInfo tankSub = tile.getTankInfo(dir)[0]; - if (tankSub == null || tankSub.fluid == null) - break; + if (tankSub == null || tankSub.fluid == null) break; float liquidAmount = (float) tankSub.fluid.amount / (float) tankSub.capacity * 0.125f / 2; renderer.setRenderBounds(bounds[0], 0.51, bounds[1], bounds[2], 0.5 + liquidAmount, bounds[3]); renderLiquidPart(world, x, y, z, block, renderer, tankSub.fluid, false); @@ -161,25 +148,30 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block return false; } - private double[] getRenderboundsForLiquid (ForgeDirection dir) - { - switch (dir) - { - case NORTH: - return new double[] { 0.375, 0, 0.625, 0.375 }; - case SOUTH: - return new double[] { 0.375, 0.625, 0.625, 1 }; - case WEST: - return new double[] { 0, 0.375, 0.375, 0.625 }; - case EAST: - return new double[] { 0.625, 0.375, 1, 0.625 }; - default: - return null; + private double[] getRenderboundsForLiquid(ForgeDirection dir) { + switch (dir) { + case NORTH: + return new double[] {0.375, 0, 0.625, 0.375}; + case SOUTH: + return new double[] {0.375, 0.625, 0.625, 1}; + case WEST: + return new double[] {0, 0.375, 0.375, 0.625}; + case EAST: + return new double[] {0.625, 0.375, 1, 0.625}; + default: + return null; } } - private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer, FluidStack fluidStack, boolean useFlowingTexture) - { + private void renderLiquidPart( + IBlockAccess world, + int x, + int y, + int z, + Block block, + RenderBlocks renderer, + FluidStack fluidStack, + boolean useFlowingTexture) { int color = block.colorMultiplier(world, x, y, z); float red = (color >> 16 & 0xFF) / 255.0F; float green = (color >> 8 & 0xFF) / 255.0F; @@ -188,13 +180,30 @@ private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block bl if (fluid.canBePlacedInWorld() && !useFlowingTexture) BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); else if (useFlowingTexture) - BlockSkinRenderHelper.renderLiquidBlock(fluid.getFlowingIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world, false, fluid.getColor(fluidStack)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getFlowingIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(fluidStack)); else - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world, false, fluid.getColor(fluidStack)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(fluidStack)); } - private void renderStandardBlock (Block block, int meta, RenderBlocks renderer) - { + private void renderStandardBlock(Block block, int meta, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); @@ -225,14 +234,12 @@ private void renderStandardBlock (Block block, int meta, RenderBlocks renderer) } @Override - public int getRenderId () - { + public int getRenderId() { return renderID; } @Override - public boolean shouldRender3DInInventory (int modelId) - { + public boolean shouldRender3DInInventory(int modelId) { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java index 3422cb1f523..6993b9e7e42 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java @@ -13,16 +13,13 @@ /* Special renderer, only used for drawing tools */ @SideOnly(Side.CLIENT) -public class CastingBasinSpecialRender extends TileEntitySpecialRenderer -{ +public class CastingBasinSpecialRender extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) - { + public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) { this.render((CastingBasinLogic) logic, var2, var4, var6, var8); } - public void render (CastingBasinLogic logic, double posX, double posY, double posZ, float var8) - { + public void render(CastingBasinLogic logic, double posX, double posY, double posZ, float var8) { GL11.glPushMatrix(); float var10 = (float) (posX - 0.5F); float var11 = (float) (posY - 0.5F); @@ -30,18 +27,15 @@ public void render (CastingBasinLogic logic, double posX, double posY, double po GL11.glTranslatef(var10, var11, var12); ItemStack stack = logic.getStackInSlot(0); - if (stack != null) - renderItem(logic, stack); + if (stack != null) renderItem(logic, stack); stack = logic.getStackInSlot(1); - if (stack != null) - renderItem(logic, stack); + if (stack != null) renderItem(logic, stack); GL11.glPopMatrix(); } - void renderItem (CastingBasinLogic logic, ItemStack stack) - { + void renderItem(CastingBasinLogic logic, ItemStack stack) { FancyEntityItem entityitem = new FancyEntityItem(logic.getWorldObj(), 0.0D, 0.0D, 0.0D, stack); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; @@ -49,13 +43,10 @@ void renderItem (CastingBasinLogic logic, ItemStack stack) GL11.glTranslatef(1F, 0.675F, 1.0F); // GL11.glRotatef(90F, 1, 0F, 0F); GL11.glScalef(1.75F, 1.75F, 1.75F); - if (stack.getItem() instanceof ItemBlock) - { + if (stack.getItem() instanceof ItemBlock) { GL11.glScalef(1.6F, 1.6F, 1.6F); GL11.glTranslatef(0F, 0.045F, 0.0f); - } - else if (!(stack.getItem() instanceof ItemBlocklike)) - { + } else if (!(stack.getItem() instanceof ItemBlocklike)) { GL11.glRotatef(90F, 1F, 0F, 0F); GL11.glRotatef(90F, 0F, 0F, 1F); GL11.glScalef(0.75F, 0.75F, 0.75F); @@ -68,5 +59,4 @@ else if (!(stack.getItem() instanceof ItemBlocklike)) GL11.glPopMatrix(); } - } diff --git a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java index b6aa2c98e03..3716b7257af 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java @@ -13,17 +13,13 @@ import tconstruct.smeltery.logic.*; import tconstruct.util.ItemHelper; -public class CastingBlockRender implements ISimpleBlockRenderingHandler -{ +public class CastingBlockRender implements ISimpleBlockRenderingHandler { public static int searedModel = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == searedModel) - { - if (metadata == 0) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == searedModel) { + if (metadata == 0) { // Top renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); @@ -47,9 +43,7 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); - } - else if (metadata == 1) - { + } else if (metadata == 1) { renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.25, 0.25, 0.625, 0.375, 0.625, 1); @@ -57,9 +51,7 @@ else if (metadata == 1) renderer.setRenderBounds(0.625, 0.25, 0.625, 0.75, 0.625, 1); ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); - } - else if (metadata == 2) - { + } else if (metadata == 2) { renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); @@ -119,9 +111,7 @@ else if (metadata == 2) ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); ItemHelper.renderStandardInvBlock(renderer, block, metadata); - } - else - { + } else { renderer.setRenderBounds(0, 0, 0, 1, 1, 1); ItemHelper.renderStandardInvBlock(renderer, block, metadata); } @@ -129,13 +119,11 @@ else if (metadata == 2) } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == searedModel) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == searedModel) { int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 0) - { + if (metadata == 0) { // Top renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); renderer.renderStandardBlock(block, x, y, z); @@ -160,11 +148,9 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); renderer.renderStandardBlock(block, x, y, z); - if (world.getTileEntity(x, y, z) instanceof CastingTableLogic) - { + if (world.getTileEntity(x, y, z) instanceof CastingTableLogic) { CastingTableLogic logic = (CastingTableLogic) world.getTileEntity(x, y, z); - if (logic.liquid != null) - { + if (logic.liquid != null) { float minHeight = 0.9375F; float maxHeight = 1F; @@ -174,11 +160,9 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block float maxZ = 0.9375F; ItemStack it = logic.getStackInSlot(0); - if (it != null) - { + if (it != null) { CastingRecipe rec = TConstruct.tableCasting.getCastingRecipe(logic.liquid, it); - if (rec != null && rec.fluidRenderProperties != null) - { + if (rec != null && rec.fluidRenderProperties != null) { minHeight = rec.fluidRenderProperties.minHeight; maxHeight = rec.fluidRenderProperties.maxHeight; @@ -196,115 +180,129 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world, false, fluid.getColor(logic.liquid)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(logic.liquid)); } } - } - else if (metadata == 1) - { - if (world.getTileEntity(x, y, z) instanceof FaucetLogic) - { + } else if (metadata == 1) { + if (world.getTileEntity(x, y, z) instanceof FaucetLogic) { FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); float xMin = 0.375F, zMin = 0.375F, xMax = 0.625F, zMax = 0.625F; - switch (logic.getRenderDirection()) - { - case 2: - renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.25, 0.375, 0.625, 0.375, 0.625, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.625, 0.75, 0.625, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); - zMin = 0.5F; - // zMin = 0.625F; - break; - case 3: - renderer.setRenderBounds(0.25, 0.25, 0, 0.75, 0.375, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.25, 0.375, 0, 0.375, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0, 0.75, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.375, 0.375, 0, 0.625, 0.625, 0.375); - zMax = 0.5F; - break; - case 4: - renderer.setRenderBounds(0.625, 0.25, 0.25, 1, 0.375, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.25, 1, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.625, 1, 0.625, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.375, 1, 0.625, 0.625); - xMin = 0.5F; - break; - case 5: - renderer.setRenderBounds(0, 0.25, 0.25, 0.375, 0.375, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0, 0.375, 0.25, 0.375, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0, 0.375, 0.625, 0.375, 0.625, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0, 0.375, 0.375, 0.375, 0.625, 0.625); - xMax = 0.5F; - break; + switch (logic.getRenderDirection()) { + case 2: + renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.25, 0.375, 0.625, 0.375, 0.625, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.625, 0.75, 0.625, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); + zMin = 0.5F; + // zMin = 0.625F; + break; + case 3: + renderer.setRenderBounds(0.25, 0.25, 0, 0.75, 0.375, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.25, 0.375, 0, 0.375, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0, 0.75, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.375, 0.375, 0, 0.625, 0.625, 0.375); + zMax = 0.5F; + break; + case 4: + renderer.setRenderBounds(0.625, 0.25, 0.25, 1, 0.375, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.25, 1, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.625, 1, 0.625, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.375, 1, 0.625, 0.625); + xMin = 0.5F; + break; + case 5: + renderer.setRenderBounds(0, 0.25, 0.25, 0.375, 0.375, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0, 0.375, 0.25, 0.375, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0, 0.375, 0.625, 0.375, 0.625, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0, 0.375, 0.375, 0.375, 0.625, 0.625); + xMax = 0.5F; + break; } float yMin = 0F; Block uBlock = world.getBlock(x, y - 1, z); int uMeta = world.getBlockMetadata(x, y - 1, z); - if ((uBlock == TinkerSmeltery.searedBlock || uBlock == TinkerSmeltery.searedBlockNether) && uMeta == 0) - { + if ((uBlock == TinkerSmeltery.searedBlock || uBlock == TinkerSmeltery.searedBlockNether) + && uMeta == 0) { yMin = -0.125F; - } - else if ((uBlock == TinkerSmeltery.searedBlock || uBlock == TinkerSmeltery.searedBlockNether) && uMeta == 2) - { + } else if ((uBlock == TinkerSmeltery.searedBlock || uBlock == TinkerSmeltery.searedBlockNether) + && uMeta == 2) { yMin = -0.75F; - } - else if (uBlock == TinkerSmeltery.lavaTank || uBlock == TinkerSmeltery.lavaTankNether) - { + } else if (uBlock == TinkerSmeltery.lavaTank || uBlock == TinkerSmeltery.lavaTankNether) { yMin = -1F; - } - else if (uBlock == TinkerSmeltery.castingChannel) - { + } else if (uBlock == TinkerSmeltery.castingChannel) { yMin = -0.5F; } - if (logic.liquid != null) - { + if (logic.liquid != null) { Fluid fluid = logic.liquid.getFluid(); renderer.setRenderBounds(xMin, yMin, zMin, xMax, 0.625, zMax); - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world, false, fluid.getColor(logic.liquid)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(logic.liquid)); // float xMin = 0.375F, zMin = 0.375F, xMax = 0.625F, // zMax = 0.625F; - switch (logic.getRenderDirection()) - { - case 3: - zMin = 0.0F; - zMax = 0.375F; - break; - case 2: - zMin = 0.625F; - zMax = 1.0F; - break; - case 5: - xMin = 0.0F; - xMax = 0.375F; - break; - case 4: - xMin = 0.625F; - xMax = 1.0F; - break; + switch (logic.getRenderDirection()) { + case 3: + zMin = 0.0F; + zMax = 0.375F; + break; + case 2: + zMin = 0.625F; + zMax = 1.0F; + break; + case 5: + xMin = 0.0F; + xMax = 0.375F; + break; + case 4: + xMin = 0.625F; + xMax = 1.0F; + break; } renderer.setRenderBounds(xMin, 0.5F, zMin, xMax, 0.625F, zMax); - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world, false, fluid.getColor(logic.liquid)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(logic.liquid)); } } - } - else if (metadata == 2) - { + } else if (metadata == 2) { renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); renderer.renderStandardBlock(block, x, y, z); @@ -367,11 +365,9 @@ else if (metadata == 2) renderer.renderStandardBlock(block, x, y, z); // Liquids - if (world.getTileEntity(x, y, z) instanceof CastingBasinLogic) - { + if (world.getTileEntity(x, y, z) instanceof CastingBasinLogic) { CastingBasinLogic logic = (CastingBasinLogic) world.getTileEntity(x, y, z); - if (logic.liquid != null) - { + if (logic.liquid != null) { float minHeight = 0.25F; float maxHeight = 0.95F; @@ -381,11 +377,9 @@ else if (metadata == 2) float maxZ = 0.9375F; ItemStack it = logic.getStackInSlot(0); - if (it != null) - { + if (it != null) { CastingRecipe rec = TConstruct.basinCasting.getCastingRecipe(logic.liquid, it); - if (rec != null && rec.fluidRenderProperties != null) - { + if (rec != null && rec.fluidRenderProperties != null) { minHeight = rec.fluidRenderProperties.minHeight; maxHeight = rec.fluidRenderProperties.maxHeight; @@ -403,12 +397,19 @@ else if (metadata == 2) renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world, false, fluid.getColor(logic.liquid)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(logic.liquid)); } } - } - else - { + } else { renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); @@ -426,14 +427,12 @@ else if (metadata == 2) } @Override - public boolean shouldRender3DInInventory (int modelid) - { + public boolean shouldRender3DInInventory(int modelid) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return searedModel; } } diff --git a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java index 32d263aca8d..dfe9c9ecabf 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java @@ -5,9 +5,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; - import org.lwjgl.opengl.GL11; - import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingTableLogic; @@ -16,17 +14,14 @@ /* Special renderer, only used for drawing tools */ @SideOnly(Side.CLIENT) -public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer -{ +public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) - { + public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) { // TConstruct.logger.info("Render!!!"); this.render((CastingTableLogic) logic, var2, var4, var6, var8); } - public void render (CastingTableLogic logic, double posX, double posY, double posZ, float var8) - { + public void render(CastingTableLogic logic, double posX, double posY, double posZ, float var8) { GL11.glPushMatrix(); float var10 = (float) (posX - 0.5F); float var11 = (float) (posY - 0.5F); @@ -36,21 +31,17 @@ public void render (CastingTableLogic logic, double posX, double posY, double po GL11.glPopMatrix(); } - private void func_82402_b (CastingTableLogic logic) - { + private void func_82402_b(CastingTableLogic logic) { ItemStack stack = logic.getStackInSlot(0); - if (stack != null) - renderItem(logic, stack); + if (stack != null) renderItem(logic, stack); stack = logic.getStackInSlot(1); - if (stack != null) - renderItem(logic, stack); + if (stack != null) renderItem(logic, stack); } - void renderItem (CastingTableLogic logic, ItemStack stack) - { + void renderItem(CastingTableLogic logic, ItemStack stack) { FancyEntityItem entityitem = new FancyEntityItem(logic.getWorldObj(), 0.0D, 0.0D, 0.0D, stack); entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; @@ -58,17 +49,15 @@ void renderItem (CastingTableLogic logic, ItemStack stack) GL11.glTranslatef(1F, 1.48F, 0.55F); GL11.glRotatef(90F, 1, 0F, 0F); GL11.glScalef(2F, 2F, 2F); - if (stack.getItem() instanceof ItemBlock || stack.getItem() instanceof ItemBlocklike) - { + if (stack.getItem() instanceof ItemBlock || stack.getItem() instanceof ItemBlocklike) { GL11.glRotatef(90F, -1, 0F, 0F); GL11.glTranslatef(0F, -0.1F, 0.2275F); } - if (stack.isItemEqual(new ItemStack(TinkerSmeltery.glassPane))) - { - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glTranslatef(0F, -0.194F, -0.1F); - GL11.glScalef(0.85F, 0.85F, 0.85F); + if (stack.isItemEqual(new ItemStack(TinkerSmeltery.glassPane))) { + GL11.glRotatef(90F, 1F, 0F, 0F); + GL11.glTranslatef(0F, -0.194F, -0.1F); + GL11.glScalef(0.85F, 0.85F, 0.85F); } RenderItem.renderInFrame = true; diff --git a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java index 1e574ebd3bc..f07c899b92b 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java @@ -1,5 +1,7 @@ package tconstruct.smeltery.model; +import static net.minecraftforge.common.util.ForgeDirection.*; + import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,22 +9,16 @@ import net.minecraft.world.IBlockAccess; import tconstruct.smeltery.blocks.GlassPaneConnected; -import static net.minecraftforge.common.util.ForgeDirection.*; - -public class PaneConnectedRender implements ISimpleBlockRenderingHandler -{ +public class PaneConnectedRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - - } + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {} @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { boolean temp = renderer.renderAllFaces; renderer.renderAllFaces = true; @@ -35,41 +31,34 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block IIcon sideTexture = pane.getSideTextureIndex(); - if (!flag && !flag1 && !flag2 && !flag3) - { + if (!flag && !flag1 && !flag2 && !flag3) { renderer.setRenderBounds(0D, 0D, 0.45D, 1D, 1D, 0.55D); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 1D); renderer.renderStandardBlock(block, x, y, z); - } - else - { + } else { // renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); // renderer.renderStandardBlock(block, x, y, z); } // renderer.setOverrideBlockTexture(sideTexture); - if (flag) - { + if (flag) { renderer.setRenderBounds(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); renderer.renderStandardBlock(block, x, y, z); } - if (flag1) - { + if (flag1) { renderer.setRenderBounds(0D, 0D, 0.45D, 0.45D, 1D, 0.55D); renderer.renderStandardBlock(block, x, y, z); } - if (flag2) - { + if (flag2) { renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 1D); renderer.renderStandardBlock(block, x, y, z); } - if (flag3) - { + if (flag3) { renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 0.45D); renderer.renderStandardBlock(block, x, y, z); } @@ -81,15 +70,12 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return false; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } - } diff --git a/src/main/java/tconstruct/smeltery/model/PaneRender.java b/src/main/java/tconstruct/smeltery/model/PaneRender.java index c1395e61166..cad653a0647 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneRender.java @@ -6,45 +6,36 @@ import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -public class PaneRender implements ISimpleBlockRenderingHandler -{ +public class PaneRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderer.setRenderBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { - //renderer.setOverrideBlockTexture(((PaneBase)block).getIcon(0, world.getBlockMetadata(x,y,z))); + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == model) { + // renderer.setOverrideBlockTexture(((PaneBase)block).getIcon(0, world.getBlockMetadata(x,y,z))); return renderer.renderBlockStainedGlassPane(block, x, y, z); - //return renderPaneInWorld(renderer, world, x, y, z, (PaneBase) block); - } - - else - { + // return renderPaneInWorld(renderer, world, x, y, z, (PaneBase) block); + } else { return false; } } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } } diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index 587e4249451..0de6c0c53e2 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -13,59 +13,48 @@ import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.ItemHelper; -public class SmelteryRender implements ISimpleBlockRenderingHandler -{ +public class SmelteryRender implements ISimpleBlockRenderingHandler { public static int smelteryModel = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == smelteryModel) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == smelteryModel) { ItemHelper.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == smelteryModel) - { - if (world.getBlockMetadata(x, y, z) == 0) - return renderSmeltery(world, x, y, z, block, modelID, renderer); - else - renderer.renderStandardBlock(block, x, y, z); + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == smelteryModel) { + if (world.getBlockMetadata(x, y, z) == 0) return renderSmeltery(world, x, y, z, block, modelID, renderer); + else renderer.renderStandardBlock(block, x, y, z); } return true; } - public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { + public boolean renderSmeltery( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { boolean ret = renderer.renderStandardBlock(block, x, y, z); SmelteryLogic logic = (SmelteryLogic) world.getTileEntity(x, y, z); - if (logic.validStructure) - { + if (logic.validStructure) { CoordTuple from = logic.minPos; CoordTuple to = logic.maxPos; - //Melting - if (logic.getSizeInventory() > 0) - { - for (int i = 0; i < logic.layers; i++) - { + // Melting + if (logic.getSizeInventory() > 0) { + for (int i = 0; i < logic.layers; i++) { renderLayer(logic, i * logic.getBlocksPerLayer(), from, to, from.y + i, renderer, world); } } - //Liquids + // Liquids float base = 0F; int yBase = 0; int liquidBase = 0; - for (FluidStack liquid : logic.moltenMetal) - { + for (FluidStack liquid : logic.moltenMetal) { int liquidSize = liquid.amount; - while (liquidSize > 0) - { + while (liquidSize > 0) { int cap = logic.getCapacityPerLayer(); int room = cap - liquidBase; int countSize = liquidSize > room ? room : liquidSize; @@ -77,27 +66,34 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl base += height; liquidBase += countSize; - if(renderHeight < 0.01) - renderHeight = 0.01f; + if (renderHeight < 0.01) renderHeight = 0.01f; renderer.setRenderBounds(0, renderBase, 0, 1, renderHeight, 1); Fluid fluid = liquid.getFluid(); for (int xi = from.x; xi <= to.x; xi++) - for (int zi = from.z; zi <= to.z; zi++) - { + for (int zi = from.z; zi <= to.z; zi++) { float minX = xi == from.x ? -0.001F : 0F; float minZ = zi == from.z ? -0.001F : 0F; float maxX = xi == to.x ? 1.001F : 1F; float maxZ = zi == to.z ? 1.001F : 1F; renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); if (fluid.canBePlacedInWorld()) - BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, xi, from.y + yBase, zi, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock( + fluid.getBlock(), 0, xi, from.y + yBase, zi, renderer, world); else - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), xi, from.y + yBase, zi, renderer, world, false, fluid.getColor(liquid)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + xi, + from.y + yBase, + zi, + renderer, + world, + false, + fluid.getColor(liquid)); } - if (countSize == room) - { + if (countSize == room) { base = 0F; yBase++; liquidBase = 0; @@ -109,27 +105,31 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl return ret; } - void renderLayer (SmelteryLogic logic, int start, CoordTuple from, CoordTuple to, int posY, RenderBlocks renderer, IBlockAccess world) - { + void renderLayer( + SmelteryLogic logic, + int start, + CoordTuple from, + CoordTuple to, + int posY, + RenderBlocks renderer, + IBlockAccess world) { renderer.setRenderBounds(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); int i = start; for (int x = from.x; x <= to.x; x++) - for (int z = from.z; z <= to.z; z++) - { + for (int z = from.z; z <= to.z; z++) { // safety because of changes. - if(i > logic.getSizeInventory()) - return; + if (i > logic.getSizeInventory()) return; ItemStack input = logic.getStackInSlot(i); - if (input != null && logic.getTempForSlot(i) > 20) - { + if (input != null && logic.getTempForSlot(i) > 20) { ItemStack blockToRender = Smeltery.getRenderIndex(input); - if (blockToRender != null) - { + if (blockToRender != null) { float blockHeight = input.stackSize / (float) blockToRender.stackSize; - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); + renderer.setRenderBounds( + 0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); Block liquidBlock = Block.getBlockFromItem(blockToRender.getItem()); - BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), x, posY, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock( + liquidBlock, blockToRender.getItemDamage(), x, posY, z, renderer, world); } } i++; @@ -137,14 +137,12 @@ void renderLayer (SmelteryLogic logic, int start, CoordTuple from, CoordTuple to } @Override - public boolean shouldRender3DInInventory (int modelId) - { + public boolean shouldRender3DInInventory(int modelId) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return smelteryModel; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java b/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java index d2abc4c1a27..239ec5ac424 100644 --- a/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java @@ -28,22 +28,22 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { Block block = Block.getBlockFromItem(item.getItem()); int meta = item.getItemDamage(); - if(item.hasTagCompound() && item.getTagCompound().hasKey("Fluid")) - { - FluidStack liquid = FluidStack.loadFluidStackFromNBT(item.getTagCompound().getCompoundTag("Fluid")); - if(liquid != null && liquid.getFluid().getBlock() != null) - { + if (item.hasTagCompound() && item.getTagCompound().hasKey("Fluid")) { + FluidStack liquid = + FluidStack.loadFluidStackFromNBT(item.getTagCompound().getCompoundTag("Fluid")); + if (liquid != null && liquid.getFluid().getBlock() != null) { GL11.glEnable(GL11.GL_BLEND); - float height = (float)liquid.amount / 4000f - 0.01f; + float height = (float) liquid.amount / 4000f - 0.01f; renderblocks.setRenderBounds(0.01, 0.01, 0.01, 0.99, height, 0.99); - ItemHelper.renderStandardInvBlock(renderblocks, liquid.getFluid().getBlock(), 0); + ItemHelper.renderStandardInvBlock( + renderblocks, liquid.getFluid().getBlock(), 0); GL11.glDisable(GL11.GL_BLEND); } } GL11.glEnable(GL11.GL_ALPHA_TEST); renderblocks.setRenderBounds(0, 0, 0, 1, 1, 1); - //ItemHelper.renderStandardInvBlock(renderblocks, block, meta); + // ItemHelper.renderStandardInvBlock(renderblocks, block, meta); RenderingRegistry.instance().renderInventoryBlock(renderblocks, block, meta, TankRender.tankModelID); GL11.glDisable(GL11.GL_ALPHA_TEST); } diff --git a/src/main/java/tconstruct/smeltery/model/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java index d34298a1df5..4dbf80ddb77 100644 --- a/src/main/java/tconstruct/smeltery/model/TankRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankRender.java @@ -11,20 +11,16 @@ import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.util.ItemHelper; -public class TankRender implements ISimpleBlockRenderingHandler -{ +public class TankRender implements ISimpleBlockRenderingHandler { public static int tankModelID = RenderingRegistry.getNextAvailableRenderId(); public static int renderPass = 0; @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == tankModelID) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == tankModelID) { ItemHelper.renderStandardInvBlock(renderer, block, metadata); // the thingie on top of lava tanks - if (metadata == 0) - { + if (metadata == 0) { renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); renderDoRe(renderer, block, metadata); } @@ -32,31 +28,35 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == tankModelID) - { - //Liquid - if (renderPass == 0) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == tankModelID) { + // Liquid + if (renderPass == 0) { LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); - if (logic.containsFluid()) - { + if (logic.containsFluid()) { FluidStack liquid = logic.tank.getFluid(); renderer.setRenderBounds(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); Fluid fluid = liquid.getFluid(); - BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getStillIcon(), x, y, z, renderer, world, false, fluid.getColor(liquid)); + BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getStillIcon(), + x, + y, + z, + renderer, + world, + false, + fluid.getColor(liquid)); return true; } return false; } - //Block - else - { + // Block + else { int meta = world.getBlockMetadata(x, y, z); - if (meta == 0 && world.getBlock(x, y + 1, z) == Blocks.air) - { + if (meta == 0 && world.getBlock(x, y + 1, z) == Blocks.air) { renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); renderer.renderStandardBlock(block, x, y + 1, z); } @@ -68,19 +68,16 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return tankModelID; } - private void renderDoRe (RenderBlocks renderblocks, Block block, int meta) - { + private void renderDoRe(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, 0.5F, -0.5F); tessellator.startDrawingQuads(); @@ -109,4 +106,4 @@ private void renderDoRe (RenderBlocks renderblocks, Block block, int meta) tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/BowRecipe.java b/src/main/java/tconstruct/tools/BowRecipe.java index cffcb74477f..955ff0a0b23 100644 --- a/src/main/java/tconstruct/tools/BowRecipe.java +++ b/src/main/java/tconstruct/tools/BowRecipe.java @@ -5,33 +5,25 @@ import tconstruct.library.crafting.ToolRecipe; import tconstruct.library.tools.ToolCore; -public class BowRecipe extends ToolRecipe -{ +public class BowRecipe extends ToolRecipe { - public BowRecipe(Item head, Item handle, ToolCore tool) - { + public BowRecipe(Item head, Item handle, ToolCore tool) { super(head, handle, tool); } - public BowRecipe(Item head, Item handle, Item accessory, ToolCore tool) - { + public BowRecipe(Item head, Item handle, Item accessory, ToolCore tool) { super(head, handle, accessory, tool); } - public BowRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore tool) - { + public BowRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore tool) { super(head, handle, accessory, extra, tool); } @Override - public boolean validHead (Item input) - { - for (Item part : headList) - { - if (part == input) - return true; - if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) - return true; + public boolean validHead(Item input) { + for (Item part : headList) { + if (part == input) return true; + if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone)) return true; } return false; } diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java index 6b136fcbecf..f67f172ae3e 100644 --- a/src/main/java/tconstruct/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/tools/TActiveOmniMod.java @@ -20,33 +20,32 @@ import tconstruct.world.TinkerWorld; import tconstruct.world.entity.BlueSlime; -public class TActiveOmniMod extends ActiveToolMod -{ +public class TActiveOmniMod extends ActiveToolMod { Random random = new Random(); /* Updating */ @Override - public void updateTool (ToolCore tool, ItemStack stack, World world, Entity entity) - { - if (!world.isRemote && entity instanceof EntityLivingBase && !((EntityLivingBase) entity).isSwingInProgress && stack.getTagCompound() != null) - { - if(entity instanceof EntityPlayer && (((EntityPlayer) entity).isUsingItem())) - return; + public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity) { + if (!world.isRemote + && entity instanceof EntityLivingBase + && !((EntityLivingBase) entity).isSwingInProgress + && stack.getTagCompound() != null) { + if (entity instanceof EntityPlayer && (((EntityPlayer) entity).isUsingItem())) return; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tags.hasKey("Moss")) - { + if (tags.hasKey("Moss")) { int chance = tags.getInteger("Moss"); - int check = world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 : 1150; + int check = + world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 : 1150; // REGROWING AMMO :OOoo - if(tool instanceof IAmmo && random.nextInt(check*3) < chance) // ammo regenerates at a much slower rate + if (tool instanceof IAmmo + && random.nextInt(check * 3) < chance) // ammo regenerates at a much slower rate { - IAmmo ammothing = (IAmmo)tool; - if(ammothing.getAmmoCount(stack) > 0) // must have ammo - ammothing.addAmmo(1, stack); + IAmmo ammothing = (IAmmo) tool; + if (ammothing.getAmmoCount(stack) > 0) // must have ammo + ammothing.addAmmo(1, stack); } // selfrepairing tool. LAAAAAME - else if (random.nextInt(check) < chance) - { + else if (random.nextInt(check) < chance) { AbilityHelper.healTool(stack, 1, (EntityLivingBase) entity, true); } } @@ -55,73 +54,59 @@ else if (random.nextInt(check) < chance) /* Harvesting */ @Override - public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity) - { + public boolean beforeBlockBreak(ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); baconator(tool, stack, entity, tags); - if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) - return false; + if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) return false; TinkerTools.modLapis.midStreamModify(stack, tool); - if (autoSmelt(tool, tags, stack, x, y, z, entity)) - return true; + if (autoSmelt(tool, tags, stack, x, y, z, entity)) return true; return false; } @Override - public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) { + public void afterBlockBreak( + ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - slimify(tool, tags, block, x,y,z, entity.worldObj); + slimify(tool, tags, block, x, y, z, entity.worldObj); } - private boolean autoSmelt (ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity) - { + private boolean autoSmelt( + ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity) { World world = entity.worldObj; Block block = world.getBlock(x, y, z); - if (block == null) - return false; + if (block == null) return false; int blockMeta = world.getBlockMetadata(x, y, z); - if(block.getMaterial().isToolNotRequired()) { + if (block.getMaterial().isToolNotRequired()) { // only if effective tool - if(tool instanceof HarvestTool) { - if (!((HarvestTool) tool).isEffective(block, blockMeta)) - return false; - } - else - return false; - } - else if(!ForgeHooks.canToolHarvestBlock(block, blockMeta, stack)) - return false; + if (tool instanceof HarvestTool) { + if (!((HarvestTool) tool).isEffective(block, blockMeta)) return false; + } else return false; + } else if (!ForgeHooks.canToolHarvestBlock(block, blockMeta, stack)) return false; - if (tags.getBoolean("Lava") && block.quantityDropped(blockMeta, 0, random) > 0) - { + if (tags.getBoolean("Lava") && block.quantityDropped(blockMeta, 0, random) > 0) { int itemMeta = block.damageDropped(blockMeta); int amount = block.quantityDropped(random); Item item = block.getItemDropped(blockMeta, random, EnchantmentHelper.getFortuneModifier(entity)); // apparently some things that don't drop blocks (like glass panes without silktouch) return null. - if (item == null) - return false; + if (item == null) return false; ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(item, amount, itemMeta)); - if (result != null) - { + if (result != null) { world.setBlockToAir(x, y, z); if (entity instanceof EntityPlayer && !((EntityPlayer) entity).capabilities.isCreativeMode) tool.onBlockDestroyed(stack, world, block, x, y, z, entity); - if (!world.isRemote) - { - ItemStack spawnme = new ItemStack(result.getItem(), amount * result.stackSize, result.getItemDamage()); - if (result.hasTagCompound()) - spawnme.setTagCompound(result.getTagCompound()); - if (!(result.getItem() instanceof ItemBlock) && PHConstruct.lavaFortuneInteraction) - { + if (!world.isRemote) { + ItemStack spawnme = + new ItemStack(result.getItem(), amount * result.stackSize, result.getItemDamage()); + if (result.hasTagCompound()) spawnme.setTagCompound(result.getTagCompound()); + if (!(result.getItem() instanceof ItemBlock) && PHConstruct.lavaFortuneInteraction) { int loot = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); - if (loot > 0) - { + if (loot > 0) { spawnme.stackSize *= (random.nextInt(loot + 1) + 1); } } @@ -135,31 +120,26 @@ else if(!ForgeHooks.canToolHarvestBlock(block, blockMeta, stack)) float f = FurnaceRecipes.smelting().func_151398_b(spawnme); int j; - if (f == 0.0F) - { + if (f == 0.0F) { i = 0; - } - else if (f < 1.0F) - { + } else if (f < 1.0F) { j = MathHelper.floor_float((float) i * f); - if (j < MathHelper.ceiling_float_int((float) i * f) && (float) Math.random() < (float) i * f - (float) j) - { + if (j < MathHelper.ceiling_float_int((float) i * f) + && (float) Math.random() < (float) i * f - (float) j) { ++j; } i = j; } - while (i > 0) - { + while (i > 0) { j = EntityXPOrb.getXPSplit(i); i -= j; entity.worldObj.spawnEntityInWorld(new EntityXPOrb(world, x, y + 0.5, z, j)); } } - for (int i = 0; i < 5; i++) - { + for (int i = 0; i < 5; i++) { float f = (float) x + random.nextFloat(); float f1 = (float) y + random.nextFloat(); float f2 = (float) z + random.nextFloat(); @@ -186,15 +166,21 @@ else if (f < 1.0F) /* Attacking */ @Override - public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public int baseAttackDamage( + int earlyModDamage, + int damage, + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { TinkerTools.modLapis.midStreamModify(stack, tool); baconator(tool, stack, player, tags); return 0; } - private void baconator (ToolCore tool, ItemStack stack, EntityLivingBase entity, NBTTagCompound tags) - { + private void baconator(ToolCore tool, ItemStack stack, EntityLivingBase entity, NBTTagCompound tags) { final int pigiron = TinkerTools.MaterialID.PigIron; int bacon = 0; bacon += tags.getInteger("Head") == pigiron ? 1 : 0; @@ -202,37 +188,29 @@ private void baconator (ToolCore tool, ItemStack stack, EntityLivingBase entity, bacon += tags.getInteger("Accessory") == pigiron ? 1 : 0; bacon += tags.getInteger("Extra") == pigiron ? 1 : 0; int chance = tool.getPartAmount() * 100; - if (random.nextInt(chance) < bacon) - { + if (random.nextInt(chance) < bacon) { if (entity instanceof EntityPlayer) AbilityHelper.spawnItemAtPlayer((EntityPlayer) entity, new ItemStack(TinkerWorld.strangeFood, 1, 2)); - else - AbilityHelper.spawnItemAtEntity(entity, new ItemStack(TinkerWorld.strangeFood, 1, 2), 0); + else AbilityHelper.spawnItemAtEntity(entity, new ItemStack(TinkerWorld.strangeFood, 1, 2), 0); } } - private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int y, int z, World world) - { - if (world.isRemote) - return; + private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int y, int z, World world) { + if (world.isRemote) return; int chance = tool.getPartAmount() * 100; int count = 0; int slimeMat = TinkerTools.MaterialID.Slime; // regular slime - if(tags.getInteger("Head") == slimeMat) - count++; - if(tags.getInteger("Handle") == slimeMat) - count++; - if(tags.getInteger("Accessory") == slimeMat) - count++; - if(tags.getInteger("Extra") == slimeMat) - count++; - - if(random.nextInt(chance) < count) { + if (tags.getInteger("Head") == slimeMat) count++; + if (tags.getInteger("Handle") == slimeMat) count++; + if (tags.getInteger("Accessory") == slimeMat) count++; + if (tags.getInteger("Extra") == slimeMat) count++; + + if (random.nextInt(chance) < count) { EntitySlime entity = new EntitySlime(world); - entity.setPosition(x+0.5,y,z+0.5); + entity.setPosition(x + 0.5, y, z + 0.5); entity.setSlimeSize(1); // minislime! world.spawnEntityInWorld(entity); entity.playLivingSound(); @@ -241,18 +219,14 @@ private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int // blueslime slimeMat = TinkerTools.MaterialID.BlueSlime; count = 0; - if(tags.getInteger("Head") == slimeMat) - count++; - if(tags.getInteger("Handle") == slimeMat) - count++; - if(tags.getInteger("Accessory") == slimeMat) - count++; - if(tags.getInteger("Extra") == slimeMat) - count++; - - if(random.nextInt(chance) < count) { + if (tags.getInteger("Head") == slimeMat) count++; + if (tags.getInteger("Handle") == slimeMat) count++; + if (tags.getInteger("Accessory") == slimeMat) count++; + if (tags.getInteger("Extra") == slimeMat) count++; + + if (random.nextInt(chance) < count) { BlueSlime entity = new BlueSlime(world); - entity.setPosition(x+0.5,y,z+0.5); + entity.setPosition(x + 0.5, y, z + 0.5); entity.setSlimeSize(1); // minislime! world.spawnEntityInWorld(entity); entity.playLivingSound(); @@ -260,30 +234,31 @@ private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int } @Override - public int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public int attackDamage( + int modDamage, + int currentDamage, + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { int bonus = modDamage; - if (entity instanceof EntityLivingBase) - { + if (entity instanceof EntityLivingBase) { EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute(); - if (attribute == EnumCreatureAttribute.UNDEAD) - { - if (tool == TinkerTools.hammer) - { + if (attribute == EnumCreatureAttribute.UNDEAD) { + if (tool == TinkerTools.hammer) { int level = 2; bonus += random.nextInt(level * 2 + 1) + level * 2; } - if (toolTags.hasKey("ModSmite")) - { + if (toolTags.hasKey("ModSmite")) { int[] array = toolTags.getIntArray("ModSmite"); int base = array[0] / 18; bonus += 1 + base + random.nextInt(base + 1); } } - if (attribute == EnumCreatureAttribute.ARTHROPOD) - { - if (toolTags.hasKey("ModAntiSpider")) - { + if (attribute == EnumCreatureAttribute.ARTHROPOD) { + if (toolTags.hasKey("ModAntiSpider")) { int[] array = toolTags.getIntArray("ModAntiSpider"); int base = array[0] / 2; bonus += 1 + base + random.nextInt(base + 1); @@ -294,11 +269,17 @@ public int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTag } @Override - public float knockback (float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { + public float knockback( + float modKnockback, + float currentKnockback, + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { float bonus = modKnockback; - if (toolTags.hasKey("Knockback")) - { + if (toolTags.hasKey("Knockback")) { float level = toolTags.getFloat("Knockback"); bonus += level; } @@ -306,10 +287,14 @@ public float knockback (float modKnockback, float currentKnockback, ToolCore too } @Override - public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) - { - if (tool == TinkerTools.cutlass && random.nextInt(10) == 0) - return true; + public boolean doesCriticalHit( + ToolCore tool, + NBTTagCompound tags, + NBTTagCompound toolTags, + ItemStack stack, + EntityLivingBase player, + Entity entity) { + if (tool == TinkerTools.cutlass && random.nextInt(10) == 0) return true; return false; } } diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index 96df7a69cf1..91ae086a7f3 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -1,10 +1,9 @@ package tconstruct.tools; -import java.util.List; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; @@ -36,42 +35,37 @@ import tconstruct.util.config.PHConstruct; import tconstruct.util.network.MovementUpdatePacket; -public class TinkerToolEvents -{ +public class TinkerToolEvents { @SubscribeEvent - public void onCrafting (ItemCraftedEvent event) - { - if (event.crafting == null || event.player == null || event.player.worldObj == null || event.craftMatrix == null) - return; + public void onCrafting(ItemCraftedEvent event) { + if (event.crafting == null + || event.player == null + || event.player.worldObj == null + || event.craftMatrix == null) return; Item item = event.crafting.getItem(); - if (!event.player.worldObj.isRemote) - { - if (item == Item.getItemFromBlock(TinkerTools.toolStationWood)) - { - if (!PHConstruct.beginnerBook) - { + if (!event.player.worldObj.isRemote) { + if (item == Item.getItemFromBlock(TinkerTools.toolStationWood)) { + if (!PHConstruct.beginnerBook) { return; } TPlayerStats stats = TPlayerStats.get(event.player); - if (!stats.materialManual) - { + if (!stats.materialManual) { stats.materialManual = true; AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TinkerTools.manualBook, 1, 1)); } } // slab pattern chest - if(item == Item.getItemFromBlock(TinkerTools.craftingSlabWood) && event.crafting.getItemDamage() == 4) { + if (item == Item.getItemFromBlock(TinkerTools.craftingSlabWood) && event.crafting.getItemDamage() == 4) { // copy over NBT - for(int i = 0; i < event.craftMatrix.getSizeInventory(); i++) { + for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) { ItemStack stack = event.craftMatrix.getStackInSlot(i); - if(stack == null) - continue; + if (stack == null) continue; // regular pattern chest - if(stack.getItem() == Item.getItemFromBlock(TinkerTools.toolStationWood) && stack.getItemDamage() == 5) - { + if (stack.getItem() == Item.getItemFromBlock(TinkerTools.toolStationWood) + && stack.getItemDamage() == 5) { event.crafting.setTagCompound(stack.getTagCompound()); break; } @@ -81,11 +75,9 @@ public void onCrafting (ItemCraftedEvent event) } @SubscribeEvent - public void buildTool (ToolBuildEvent event) - { + public void buildTool(ToolBuildEvent event) { // check if the handle is a bone - if (event.handleStack.getItem() == Items.bone) - { + if (event.handleStack.getItem() == Items.bone) { event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 5); // bone tool rod return; } @@ -93,25 +85,21 @@ public void buildTool (ToolBuildEvent event) // check if the handle is a stick List sticks = OreDictionary.getOres("stickWood"); for (ItemStack stick : sticks) - if (OreDictionary.itemMatches(stick, event.handleStack, false)) - { + if (OreDictionary.itemMatches(stick, event.handleStack, false)) { event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 0); // wooden tool rod return; } } @SubscribeEvent - public void craftTool (ToolCraftEvent.NormalTool event) - { + public void craftTool(ToolCraftEvent.NormalTool event) { NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool"); - if (PHConstruct.denyMattock && event.tool == TinkerTools.mattock) - { + if (PHConstruct.denyMattock && event.tool == TinkerTools.mattock) { int head = toolTag.getInteger("Head"); int handle = toolTag.getInteger("Handle"); int accessory = toolTag.getInteger("Accessory"); - if (!allowCrafting(head, handle, accessory)) - { + if (!allowCrafting(head, handle, accessory)) { event.setResult(Result.DENY); return; } @@ -121,169 +109,140 @@ public void craftTool (ToolCraftEvent.NormalTool event) handlePaper(toolTag, event.tool); handleThaumium(toolTag, event.tool); - if (event.tool == TinkerTools.battlesign) - { + if (event.tool == TinkerTools.battlesign) { int modifiers = toolTag.getInteger("Modifiers"); modifiers += 1; toolTag.setInteger("Modifiers", modifiers); } } - private void handlePaper (NBTTagCompound toolTag, ToolCore tool) - { + private void handlePaper(NBTTagCompound toolTag, ToolCore tool) { int modifiers = toolTag.getInteger("Modifiers"); - if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) - modifiers++; - if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Paper) - modifiers++; - if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Paper) - modifiers++; - if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Paper) - modifiers++; + if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) modifiers++; + if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Paper) modifiers++; + if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Paper) modifiers++; + if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Paper) modifiers++; // 2 part tools gain 2 modifiers for the head - if (tool.getPartAmount() == 2 && toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) - modifiers++; + if (tool.getPartAmount() == 2 && toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) modifiers++; toolTag.setInteger("Modifiers", modifiers); } - private void handleThaumium (NBTTagCompound toolTag, ToolCore tool) - { + private void handleThaumium(NBTTagCompound toolTag, ToolCore tool) { // count thaumic parts int thaum = 0; - if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Thaumium) - thaum++; - if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Thaumium) - thaum++; - if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Thaumium) - thaum++; - if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Thaumium) - thaum++; + if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Thaumium) thaum++; + if (toolTag.getInteger("Handle") == TinkerTools.MaterialID.Thaumium) thaum++; + if (toolTag.getInteger("Accessory") == TinkerTools.MaterialID.Thaumium) thaum++; + if (toolTag.getInteger("Extra") == TinkerTools.MaterialID.Thaumium) thaum++; // each part gives 0.5 modifiers, rounded up int bonusModifiers = (int) Math.ceil((double) thaum / 2d); // 2-part tools get 1 modifier per part - if (tool.getPartAmount() == 2) - bonusModifiers = thaum; + if (tool.getPartAmount() == 2) bonusModifiers = thaum; int modifiers = toolTag.getInteger("Modifiers"); modifiers += bonusModifiers; toolTag.setInteger("Modifiers", modifiers); } - private boolean allowCrafting (int head, int handle, int accessory) - { - int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; - for (int i = 0; i < nonMetals.length; i++) - { - if (head == nonMetals[i] || handle == nonMetals[i] || accessory == nonMetals[i]) - return false; + private boolean allowCrafting(int head, int handle, int accessory) { + int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; + for (int i = 0; i < nonMetals.length; i++) { + if (head == nonMetals[i] || handle == nonMetals[i] || accessory == nonMetals[i]) return false; } return true; } @SubscribeEvent - public void craftPart (PartBuilderEvent.NormalPart event) - { + public void craftPart(PartBuilderEvent.NormalPart event) { // bowstring - if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 23) - { + if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 23) { ItemStack result = craftBowString(event.material); - if (result != null) - { - event.overrideResult(new ItemStack[] { result, null }); + if (result != null) { + event.overrideResult(new ItemStack[] {result, null}); } } // fletching - if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 24) - { + if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 24) { ItemStack result = craftFletching(event.material); - if (result != null) - { - event.overrideResult(new ItemStack[] { result, null }); + if (result != null) { + event.overrideResult(new ItemStack[] {result, null}); } } } - public static ItemStack craftBowString (ItemStack stack) - { - if (stack.stackSize < 3) - return null; + public static ItemStack craftBowString(ItemStack stack) { + if (stack.stackSize < 3) return null; - BowstringMaterial mat = (BowstringMaterial) TConstructRegistry.getCustomMaterial(stack, BowstringMaterial.class); - if (mat != null) - return mat.craftingItem.copy(); + BowstringMaterial mat = + (BowstringMaterial) TConstructRegistry.getCustomMaterial(stack, BowstringMaterial.class); + if (mat != null) return mat.craftingItem.copy(); return null; } - public static ItemStack craftFletching (ItemStack stack) - { - FletchingMaterial mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchingMaterial.class); + public static ItemStack craftFletching(ItemStack stack) { + FletchingMaterial mat = + (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchingMaterial.class); // maybe it's a leaf fletchling if (mat == null) mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchlingLeafMaterial.class); - if (mat != null) - return mat.craftingItem.copy(); + if (mat != null) return mat.craftingItem.copy(); return null; } @SubscribeEvent - public void onAttack (LivingAttackEvent event) - { - //System.out.println("Damage: "+event.ammount); - if (event.entityLiving instanceof EntityPlayer) - { + public void onAttack(LivingAttackEvent event) { + // System.out.println("Damage: "+event.ammount); + if (event.entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entityLiving; - //Cutlass + // Cutlass ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.getItem() == TinkerTools.battlesign) - { + if (stack != null && stack.getItem() == TinkerTools.battlesign) { // broken battlesign? - if(!stack.hasTagCompound() || stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) - return; + if (!stack.hasTagCompound() + || stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) return; DamageSource source = event.source; - if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion()) - { - if (source.isProjectile()) - { + if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion()) { + if (source.isProjectile()) { Entity projectile = source.getSourceOfDamage(); - if(projectile == null) - return; - Vec3 motion = Vec3.createVectorHelper(projectile.motionX, projectile.motionY, projectile.motionZ); + if (projectile == null) return; + Vec3 motion = + Vec3.createVectorHelper(projectile.motionX, projectile.motionY, projectile.motionZ); Vec3 look = player.getLookVec(); // this gives a factor of how much we're looking at the incoming arrow double strength = -look.dotProduct(motion.normalize()); // we're looking away. oh no. - if(strength < 0.1) - return; + if (strength < 0.1) return; // no damage, hooraaay event.setCanceled(true); - double speed = projectile.motionX*projectile.motionX + projectile.motionY*projectile.motionY + projectile.motionZ*projectile.motionZ; + double speed = projectile.motionX * projectile.motionX + + projectile.motionY * projectile.motionY + + projectile.motionZ * projectile.motionZ; speed = Math.sqrt(speed); - speed = (speed+2)*strength; - - + speed = (speed + 2) * strength; // now we simply set the look vector with the speed and get our new vector! projectile.motionX = look.xCoord * speed; projectile.motionY = look.yCoord * speed; projectile.motionZ = look.zCoord * speed; - projectile.rotationYaw = (float)(Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D / Math.PI); - projectile.rotationPitch = (float)(Math.atan2(projectile.motionY, speed) * 180.0D / Math.PI); + projectile.rotationYaw = + (float) (Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D / Math.PI); + projectile.rotationPitch = (float) (Math.atan2(projectile.motionY, speed) * 180.0D / Math.PI); // send the current status to the client TConstruct.packetPipeline.sendToAll(new MovementUpdatePacket(projectile)); - if(projectile instanceof EntityArrow) { + if (projectile instanceof EntityArrow) { ((EntityArrow) projectile).shootingEntity = player; // the inverse is done when the event is cancelled in arrows etc. @@ -291,110 +250,95 @@ public void onAttack (LivingAttackEvent event) projectile.motionX /= -0.10000000149011612D; projectile.motionY /= -0.10000000149011612D; projectile.motionZ /= -0.10000000149011612D; -// projectile.rotationYaw -= 180.0F; -// projectile.prevRotationYaw -= 180.0F; + // projectile.rotationYaw -= 180.0F; + // projectile.prevRotationYaw -= 180.0F; // not needed at the client since it gets the absolute values sent - // tinker projectiles don't check for stuff hit to prevent weird behaviour. // we have to de-defuse them so the reflected projectiles can hit stuff again - if(projectile instanceof ProjectileBase) - ((ProjectileBase) projectile).defused = false; + if (projectile instanceof ProjectileBase) ((ProjectileBase) projectile).defused = false; } - } - else - { + } else { Entity attacker = source.getEntity(); - if (attacker != null) - { + if (attacker != null) { attacker.attackEntityFrom(DamageSource.causeThornsDamage(player), event.ammount); } } // durability-- - AbilityHelper.damageTool(stack, (int)Math.ceil(event.ammount/2f), player, false); + AbilityHelper.damageTool(stack, (int) Math.ceil(event.ammount / 2f), player, false); } } } } @SubscribeEvent - public void onLivingDrop (LivingDropsEvent event) - { - if (event.entityLiving == null) - return; + public void onLivingDrop(LivingDropsEvent event) { + if (event.entityLiving == null) return; - if (event.recentlyHit) - { - if (event.entityLiving instanceof EntitySkeleton) - { + if (event.recentlyHit) { + if (event.entityLiving instanceof EntitySkeleton) { EntitySkeleton enemy = (EntitySkeleton) event.entityLiving; - if (event.source.damageType.equals("player")) - { + if (event.source.damageType.equals("player")) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) - { - int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TinkerTools.cleaver) - beheading += 2; - if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) - { + if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { + int beheading = stack.getTagCompound() + .getCompoundTag("InfiTool") + .getInteger("Beheading"); + if (stack.getItem() == TinkerTools.cleaver) beheading += 2; + if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, enemy.getSkeletonType())); } } } - if (enemy.getSkeletonType() == 1 && TConstruct.random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) - { + if (enemy.getSkeletonType() == 1 + && TConstruct.random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) { ItemHelper.addDrops(event, new ItemStack(TinkerTools.materials, 1, 8)); } } - if (event.entityLiving.getClass() == EntityZombie.class) - { + if (event.entityLiving.getClass() == EntityZombie.class) { EntityZombie enemy = (EntityZombie) event.entityLiving; - if (event.source.damageType.equals("player")) - { + if (event.source.damageType.equals("player")) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) - { - int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { + int beheading = stack.getTagCompound() + .getCompoundTag("InfiTool") + .getInteger("Beheading"); if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver) beheading += 2; - if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) - { + if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 10) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 2)); } } - if (stack != null && stack.hasTagCompound() && stack.getItem() == TinkerTools.cleaver && TConstruct.random.nextInt(100) < 10) - { + if (stack != null + && stack.hasTagCompound() + && stack.getItem() == TinkerTools.cleaver + && TConstruct.random.nextInt(100) < 10) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 2)); } - } } - if (event.entityLiving.getClass() == EntityCreeper.class) - { + if (event.entityLiving.getClass() == EntityCreeper.class) { EntityCreeper enemy = (EntityCreeper) event.entityLiving; - if (event.source.damageType.equals("player")) - { + if (event.source.damageType.equals("player")) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) - { - int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TinkerTools.cleaver) - beheading += 2; - if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 5) - { + if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { + int beheading = stack.getTagCompound() + .getCompoundTag("InfiTool") + .getInteger("Beheading"); + if (stack.getItem() == TinkerTools.cleaver) beheading += 2; + if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 5) { ItemHelper.addDrops(event, new ItemStack(Items.skull, 1, 4)); } } @@ -402,30 +346,23 @@ public void onLivingDrop (LivingDropsEvent event) } } - if (event.entityLiving instanceof EntityPlayer) - { + if (event.entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entityLiving; - if (PHConstruct.dropPlayerHeads) - { + if (PHConstruct.dropPlayerHeads) { ItemStack dropStack = new ItemStack(Items.skull, 1, 3); NBTTagCompound nametag = new NBTTagCompound(); nametag.setString("SkullOwner", player.getDisplayName()); dropStack.setTagCompound(nametag); ItemHelper.addDrops(event, dropStack); - } - - else if (event.source.damageType.equals("player")) - { + } else if (event.source.damageType.equals("player")) { EntityPlayer source = (EntityPlayer) event.source.getEntity(); ItemStack stack = source.getCurrentEquippedItem(); - if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) - { - int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TinkerTools.cleaver) - beheading += 2; - if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 50) - { + if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { + int beheading = + stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (stack.getItem() == TinkerTools.cleaver) beheading += 2; + if (beheading > 0 && TConstruct.random.nextInt(100) < beheading * 50) { ItemStack dropStack = new ItemStack(Items.skull, 1, 3); NBTTagCompound nametag = new NBTTagCompound(); nametag.setString("SkullOwner", player.getDisplayName()); @@ -438,53 +375,41 @@ else if (event.source.damageType.equals("player")) } @SubscribeEvent - public void registerOre (OreRegisterEvent evt) - { + public void registerOre(OreRegisterEvent evt) { - if (evt.Name.equals("crystalQuartz")) - { + if (evt.Name.equals("crystalQuartz")) { TinkerTools.modAttack.addStackToMatchList(evt.Ore, 2); - } - - else if (evt.Name.equals("crystalCertusQuartz")) - { + } else if (evt.Name.equals("crystalCertusQuartz")) { TinkerTools.modAttack.addStackToMatchList(evt.Ore, 24); } } - - @SubscribeEvent - public void damageToolsOnDeath (PlayerDropsEvent event) - { - if(!PHConstruct.deathPenality) - return; + public void damageToolsOnDeath(PlayerDropsEvent event) { + if (!PHConstruct.deathPenality) return; EnumDifficulty difficulty = event.entityPlayer.worldObj.difficultySetting; // easy and peaceful don't punish - if(difficulty == EnumDifficulty.PEACEFUL || difficulty == EnumDifficulty.EASY) - return; + if (difficulty == EnumDifficulty.PEACEFUL || difficulty == EnumDifficulty.EASY) return; int punishment = 20; // normal has 5% - if(difficulty == EnumDifficulty.HARD) - punishment = 10; // hard has 10% + if (difficulty == EnumDifficulty.HARD) punishment = 10; // hard has 10% // check if we have to reduce it // did the player live long enough to receive derp-protection? // (yes, you receive protection every time you log in. we're that nice.) int derp = 1; - if(event.entityPlayer.ticksExisted < 60*5*20 ) { + if (event.entityPlayer.ticksExisted < 60 * 5 * 20) { derp = TPlayerStats.get(event.entityPlayer).derpLevel; - if(derp <= 0) derp = 1; + if (derp <= 0) derp = 1; punishment *= derp; } boolean damaged = false; - for(EntityItem drop : event.drops) - { + for (EntityItem drop : event.drops) { // we're only interested in tools - if(!(drop.getEntityItem().getItem() instanceof ToolCore) || !drop.getEntityItem().hasTagCompound()) - continue; + if (!(drop.getEntityItem().getItem() instanceof ToolCore) + || !drop.getEntityItem().hasTagCompound()) continue; // damage tools by 10% of their total durability! NBTTagCompound tags = drop.getEntityItem().getTagCompound().getCompoundTag("InfiTool"); @@ -495,11 +420,11 @@ public void damageToolsOnDeath (PlayerDropsEvent event) damaged = true; } - if(damaged) { + if (damaged) { derp++; } // increase derplevel by 1. Minimal derp level is 1. - TPlayerStats.get(event.entityPlayer).derpLevel = derp+1; + TPlayerStats.get(event.entityPlayer).derpLevel = derp + 1; } } diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index a60ad862408..56b3e253ae1 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -1,5 +1,7 @@ package tconstruct.tools; +import static net.minecraft.util.EnumChatFormatting.*; + import cpw.mods.fml.common.*; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.*; @@ -38,12 +40,12 @@ import tconstruct.world.blocks.SoilBlock; import tconstruct.world.itemblocks.CraftedSoilItemBlock; -import static net.minecraft.util.EnumChatFormatting.*; - @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers' Tools", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", forced = true) -public class TinkerTools -{ +@Pulse( + id = "Tinkers' Tools", + description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", + forced = true) +public class TinkerTools { /* Proxies for sides, used for graphics processing */ @SidedProxy(clientSide = "tconstruct.tools.ToolProxyClient", serverSide = "tconstruct.tools.ToolProxyCommon") public static ToolProxyCommon proxy; @@ -51,12 +53,16 @@ public class TinkerTools // backwards compatibility @Deprecated public static Item bowstring; + @Deprecated public static Item arrowhead; + @Deprecated public static Item fletching; + @Deprecated public static ToolCore shortbow; + @Deprecated public static ToolCore arrow; @@ -92,7 +98,7 @@ public class TinkerTools // Patterns and other materials public static Item blankPattern; - public static Item materials; //TODO: Untwine this item + public static Item materials; // TODO: Untwine this item public static Item toolRod; public static Item toolShard; public static Item titleIcon; @@ -119,7 +125,7 @@ public class TinkerTools public static Item handGuard; public static Item crossbar; public static Item fullGuard; - public static Block craftedSoil; //TODO: Untwine this + public static Block craftedSoil; // TODO: Untwine this public static Block multiBrick; public static Block multiBrickFancy; public static Block multiBrickMetal; @@ -135,19 +141,17 @@ public class TinkerTools // recipe stuff public static boolean thaumcraftAvailable; - - //Dev/Null Stuff + + // Dev/Null Stuff public static Item openBlocksDevNull; @Handler - public void preInit (FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { TinkerToolEvents toolEvents = new TinkerToolEvents(); MinecraftForge.EVENT_BUS.register(toolEvents); FMLCommonHandler.instance().bus().register(toolEvents); - - //Blocks + // Blocks TinkerTools.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation"); TinkerTools.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge"); TinkerTools.craftingStationWood = new CraftingStationBlock(Material.wood).setBlockName("CraftingStation"); @@ -179,11 +183,13 @@ public void preInit (FMLPreInitializationEvent event) GameRegistry.registerBlock(TinkerTools.craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); - //Items + // Items TinkerTools.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); GameRegistry.registerItem(TinkerTools.titleIcon, "titleIcon"); - String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - TinkerTools.blankPattern = new CraftAchievementItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab, "tconstruct.pattern").setUnlocalizedName("tconstruct.Pattern"); + String[] blanks = new String[] {"blank_pattern", "blank_cast", "blank_cast"}; + TinkerTools.blankPattern = new CraftAchievementItem( + blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab, "tconstruct.pattern") + .setUnlocalizedName("tconstruct.Pattern"); GameRegistry.registerItem(TinkerTools.blankPattern, "blankPattern"); TinkerTools.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); @@ -195,11 +201,38 @@ public void preInit (FMLPreInitializationEvent event) TConstructRegistry.addItemToDirectory("blankPattern", TinkerTools.blankPattern); TConstructRegistry.addItemToDirectory("woodPattern", TinkerTools.woodPattern); - String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard", "bowString", "fletching", "arrowHead" }; - - for (int i = 1; i < patternTypes.length; i++) - { - TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(TinkerTools.woodPattern, 1, i)); + String[] patternTypes = { + "ingot", + "toolRod", + "pickaxeHead", + "shovelHead", + "hatchetHead", + "swordBlade", + "wideGuard", + "handGuard", + "crossbar", + "binding", + "frypanHead", + "signHead", + "knifeBlade", + "chiselHead", + "toughRod", + "toughBinding", + "largePlate", + "broadAxeHead", + "scytheHead", + "excavatorHead", + "largeBlade", + "hammerHead", + "fullGuard", + "bowString", + "fletching", + "arrowHead" + }; + + for (int i = 1; i < patternTypes.length; i++) { + TConstructRegistry.addItemStackToDirectory( + patternTypes[i] + "Pattern", new ItemStack(TinkerTools.woodPattern, 1, i)); } TinkerTools.manualBook = new Manual(); @@ -228,11 +261,48 @@ public void preInit (FMLPreInitializationEvent event) TinkerTools.arrow = new Arrow(); // to prevent nullpointers - Item[] tools = { TinkerTools.pickaxe, TinkerTools.shovel, TinkerTools.hatchet, TinkerTools.broadsword, TinkerTools.longsword, TinkerTools.rapier, TinkerTools.dagger, TinkerTools.cutlass, TinkerTools.frypan, TinkerTools.battlesign, TinkerTools.mattock, TinkerTools.chisel, TinkerTools.lumberaxe, TinkerTools.cleaver, TinkerTools.scythe, TinkerTools.excavator, TinkerTools.hammer, TinkerTools.battleaxe}; - String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", "excavator", "hammer", "battleaxe"}; - - for (int i = 0; i < tools.length; i++) - { + Item[] tools = { + TinkerTools.pickaxe, + TinkerTools.shovel, + TinkerTools.hatchet, + TinkerTools.broadsword, + TinkerTools.longsword, + TinkerTools.rapier, + TinkerTools.dagger, + TinkerTools.cutlass, + TinkerTools.frypan, + TinkerTools.battlesign, + TinkerTools.mattock, + TinkerTools.chisel, + TinkerTools.lumberaxe, + TinkerTools.cleaver, + TinkerTools.scythe, + TinkerTools.excavator, + TinkerTools.hammer, + TinkerTools.battleaxe + }; + String[] toolStrings = { + "pickaxe", + "shovel", + "hatchet", + "broadsword", + "longsword", + "rapier", + "dagger", + "cutlass", + "frypan", + "battlesign", + "mattock", + "chisel", + "lumberaxe", + "cleaver", + "scythe", + "excavator", + "hammer", + "battleaxe" + }; + + for (int i = 0; i < tools.length; i++) { GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); } @@ -240,7 +310,8 @@ public void preInit (FMLPreInitializationEvent event) TinkerTools.potionLauncher = new PotionLauncher().setUnlocalizedName("tconstruct.PotionLauncher"); GameRegistry.registerItem(TinkerTools.potionLauncher, "potionLauncher"); - //TinkerTools.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); + // TinkerTools.pickaxeHead = new ToolPart("_pickaxe_head", + // "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); TinkerTools.pickaxeHead = new DynamicToolPart("_pickaxe_head", "PickaxeHead"); TinkerTools.shovelHead = new DynamicToolPart("_shovel_head", "ShovelHead"); TinkerTools.hatchetHead = new DynamicToolPart("_axe_head", "AxeHead"); @@ -266,25 +337,107 @@ public void preInit (FMLPreInitializationEvent event) TinkerTools.largeSwordBlade = new DynamicToolPart("_large_sword_blade", "LargeSwordBlade"); TinkerTools.hammerHead = new DynamicToolPart("_hammer_head", "HammerHead"); - - - Item[] toolParts = { TinkerTools.toolRod, TinkerTools.toolShard, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.toughBinding, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.fullGuard, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead, TinkerTools.scytheBlade, TinkerTools.broadAxeHead, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead}; - String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead" }; - - for (int i = 0; i < toolParts.length; i++) - { + Item[] toolParts = { + TinkerTools.toolRod, + TinkerTools.toolShard, + TinkerTools.pickaxeHead, + TinkerTools.shovelHead, + TinkerTools.hatchetHead, + TinkerTools.binding, + TinkerTools.toughBinding, + TinkerTools.toughRod, + TinkerTools.largePlate, + TinkerTools.swordBlade, + TinkerTools.wideGuard, + TinkerTools.handGuard, + TinkerTools.crossbar, + TinkerTools.knifeBlade, + TinkerTools.fullGuard, + TinkerTools.frypanHead, + TinkerTools.signHead, + TinkerTools.chiselHead, + TinkerTools.scytheBlade, + TinkerTools.broadAxeHead, + TinkerTools.excavatorHead, + TinkerTools.largeSwordBlade, + TinkerTools.hammerHead + }; + String[] toolPartStrings = { + "toolRod", + "toolShard", + "pickaxeHead", + "shovelHead", + "hatchetHead", + "binding", + "toughBinding", + "toughRod", + "heavyPlate", + "swordBlade", + "wideGuard", + "handGuard", + "crossbar", + "knifeBlade", + "fullGuard", + "frypanHead", + "signHead", + "chiselHead", + "scytheBlade", + "broadAxeHead", + "excavatorHead", + "largeSwordBlade", + "hammerHead" + }; + + for (int i = 0; i < toolParts.length; i++) { GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7 - // compat + // compat TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); } TinkerTools.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative"); GameRegistry.registerItem(TinkerTools.creativeModifier, "creativeModifier"); - String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; - - for (int i = 0; i < materialStrings.length; i++) - { + String[] materialStrings = { + "paperStack", + "greenSlimeCrystal", + "searedBrick", + "ingotCobalt", + "ingotArdite", + "ingotManyullyn", + "mossBall", + "lavaCrystal", + "necroticBone", + "ingotCopper", + "ingotTin", + "ingotAluminum", + "rawAluminum", + "ingotBronze", + "ingotAluminumBrass", + "ingotAlumite", + "ingotSteel", + "blueSlimeCrystal", + "ingotObsidian", + "nuggetIron", + "nuggetCopper", + "nuggetTin", + "nuggetAluminum", + "nuggetSilver", + "nuggetAluminumBrass", + "silkyCloth", + "silkyJewel", + "nuggetObsidian", + "nuggetCobalt", + "nuggetArdite", + "nuggetManyullyn", + "nuggetBronze", + "nuggetAlumite", + "nuggetSteel", + "ingotPigIron", + "nuggetPigIron", + "glueball" + }; + + for (int i = 0; i < materialStrings.length; i++) { TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(TinkerTools.materials, 1, i)); } @@ -293,18 +446,49 @@ public void preInit (FMLPreInitializationEvent event) registerStencils(); // this array is only used to register the remaining pattern-part-interactions - TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod, TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.fullGuard, null, null, TinkerWeaponry.arrowhead, null }; - - //Moved temporarily to deal with AE2 Quartz + TinkerTools.patternOutputs = new Item[] { + TinkerTools.toolRod, + TinkerTools.pickaxeHead, + TinkerTools.shovelHead, + TinkerTools.hatchetHead, + TinkerTools.swordBlade, + TinkerTools.wideGuard, + TinkerTools.handGuard, + TinkerTools.crossbar, + TinkerTools.binding, + TinkerTools.frypanHead, + TinkerTools.signHead, + TinkerTools.knifeBlade, + TinkerTools.chiselHead, + TinkerTools.toughRod, + TinkerTools.toughBinding, + TinkerTools.largePlate, + TinkerTools.broadAxeHead, + TinkerTools.scytheBlade, + TinkerTools.excavatorHead, + TinkerTools.largeSwordBlade, + TinkerTools.hammerHead, + TinkerTools.fullGuard, + null, + null, + TinkerWeaponry.arrowhead, + null + }; + + // Moved temporarily to deal with AE2 Quartz TinkerTools.modFlux = new ModFlux(); ModifyBuilder.registerModifier(TinkerTools.modFlux); ItemStack lapisItem = new ItemStack(Items.dye, 1, 4); ItemStack lapisBlock = new ItemStack(Blocks.lapis_block); - TinkerTools.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 }); + TinkerTools.modLapis = new ModLapis(10, new ItemStack[] {lapisItem, lapisBlock}, new int[] {1, 9}); ModifyBuilder.registerModifier(TinkerTools.modLapis); - TinkerTools.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); + TinkerTools.modAttack = new ModAttack( + "Quartz", + 11, + new ItemStack[] {new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)}, + new int[] {1, 4}); ModifyBuilder.registerModifier(TinkerTools.modAttack); oreRegistry(); @@ -356,10 +540,28 @@ private void oreRegistry() { OreDictionary.registerOre("dustAluminiumBrass", new ItemStack(TinkerTools.materials, 1, 42)); OreDictionary.registerOre("dustAluminumBrass", new ItemStack(TinkerTools.materials, 1, 42)); - String[] matNames = { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blueslime" }; - for (int i = 0; i < matNames.length; i++) - { - //TODO 1.8 remove this ore dict entry as it's outdated(use materialRod instead) + String[] matNames = { + "Wood", + "Stone", + "Iron", + "Flint", + "Cactus", + "Bone", + "Obsidian", + "Netherrack", + "Slime", + "Paper", + "Cobalt", + "Ardite", + "Manyullyn", + "Copper", + "Bronze", + "Alumite", + "Steel", + "Blueslime" + }; + for (int i = 0; i < matNames.length; i++) { + // TODO 1.8 remove this ore dict entry as it's outdated(use materialRod instead) OreDictionary.registerOre(matNames[i].toLowerCase() + "Rod", new ItemStack(TinkerTools.toolRod, 1, i)); OreDictionary.registerOre("rod" + matNames[i], new ItemStack(TinkerTools.toolRod, 1, i)); } @@ -368,14 +570,12 @@ private void oreRegistry() { OreDictionary.registerOre("slimeball", new ItemStack(TinkerTools.materials, 1, 36)); BlockDispenser.dispenseBehaviorRegistry.putObject(TinkerTools.titleIcon, new TDispenserBehaviorSpawnEgg()); - + // Added into forge in 1.8. Remove this line when porting. OreDictionary.registerOre("chestWood", new ItemStack(Blocks.chest)); } - - void setupToolTabs () - { + void setupToolTabs() { TConstructRegistry.materialTab.init(new ItemStack(TinkerTools.manualBook, 1, 0)); TConstructRegistry.partTab.init(new ItemStack(TinkerTools.titleIcon, 1, 255)); TConstructRegistry.blockTab.init(new ItemStack(TinkerTools.toolStationWood)); @@ -391,17 +591,14 @@ void setupToolTabs () TConstructRegistry.toolTab.init(tool); } - //@Override - public int getBurnTime (ItemStack fuel) - { - if (fuel.getItem() == TinkerTools.materials && fuel.getItemDamage() == 7) - return 26400; + // @Override + public int getBurnTime(ItemStack fuel) { + if (fuel.getItem() == TinkerTools.materials && fuel.getItemDamage() == 7) return 26400; return 0; } @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { addPartMapping(); addRecipesForToolBuilder(); addRecipesForChisel(); @@ -411,43 +608,41 @@ public void init (FMLInitializationEvent event) } @Handler - public void postInit (FMLPostInitializationEvent evt) - { + public void postInit(FMLPostInitializationEvent evt) { vanillaToolRecipes(); addOreDictPartMapping(); modIntegration(); metalPartCraftingIntegration(); // Fix for chisels harvetslevel derp - if("chisel".equals(Blocks.stone.getHarvestTool(0))) - Blocks.stone.setHarvestLevel("pickaxe", 0, 0); + if ("chisel".equals(Blocks.stone.getHarvestTool(0))) Blocks.stone.setHarvestLevel("pickaxe", 0, 0); } - private void addPartMapping () - { + private void addPartMapping() { /* Tools */ - int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; + int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; - if (PHConstruct.craftMetalTools) - { - for (int mat = 0; mat < 18; mat++) - { - for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) - { + if (PHConstruct.craftMetalTools) { + for (int mat = 0; mat < 18; mat++) { + for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { if (TinkerTools.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, mat, new ItemStack(TinkerTools.patternOutputs[meta], 1, mat)); + TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + meta + 1, + mat, + new ItemStack(TinkerTools.patternOutputs[meta], 1, mat)); } } - } - else - { - for (int mat = 0; mat < nonMetals.length; mat++) - { - for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) - { + } else { + for (int mat = 0; mat < nonMetals.length; mat++) { + for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { if (TinkerTools.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, nonMetals[mat], new ItemStack(TinkerTools.patternOutputs[meta], 1, nonMetals[mat])); + TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + meta + 1, + nonMetals[mat], + new ItemStack(TinkerTools.patternOutputs[meta], 1, nonMetals[mat])); } } } @@ -462,84 +657,159 @@ private void addOreDictPartMapping() { registerPatternMaterial("compressedCobblestone1x", 18, "Stone"); } - private void metalPartCraftingIntegration() - { - if(TConstruct.pulsar.isPulseLoaded("Tinkers' Smeltery") || !PHConstruct.craftMetalTools) - return; + private void metalPartCraftingIntegration() { + if (TConstruct.pulsar.isPulseLoaded("Tinkers' Smeltery") || !PHConstruct.craftMetalTools) return; String[] metals = {"Iron", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "PigIron"}; - for(String metal : metals) { + for (String metal : metals) { TinkerTools.registerPatternMaterial("ingot" + metal, 2, metal); TinkerTools.registerPatternMaterial("block" + metal, 18, metal); } } - private void addRecipesForToolBuilder () - { + private void addRecipesForToolBuilder() { ToolBuilder tb = ToolBuilder.instance; tb.addNormalToolRecipe(TinkerTools.pickaxe, TinkerTools.pickaxeHead, TinkerTools.toolRod, TinkerTools.binding); - tb.addNormalToolRecipe(TinkerTools.broadsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.wideGuard); + tb.addNormalToolRecipe( + TinkerTools.broadsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.wideGuard); tb.addNormalToolRecipe(TinkerTools.hatchet, TinkerTools.hatchetHead, TinkerTools.toolRod); tb.addNormalToolRecipe(TinkerTools.shovel, TinkerTools.shovelHead, TinkerTools.toolRod); - tb.addNormalToolRecipe(TinkerTools.longsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.handGuard); + tb.addNormalToolRecipe( + TinkerTools.longsword, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.handGuard); tb.addNormalToolRecipe(TinkerTools.rapier, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.crossbar); tb.addNormalToolRecipe(TinkerTools.frypan, TinkerTools.frypanHead, TinkerTools.toolRod); tb.addNormalToolRecipe(TinkerTools.battlesign, TinkerTools.signHead, TinkerTools.toolRod); - tb.addNormalToolRecipe(TinkerTools.mattock, TinkerTools.hatchetHead, TinkerTools.toolRod, TinkerTools.shovelHead); + tb.addNormalToolRecipe( + TinkerTools.mattock, TinkerTools.hatchetHead, TinkerTools.toolRod, TinkerTools.shovelHead); tb.addNormalToolRecipe(TinkerTools.dagger, TinkerTools.knifeBlade, TinkerTools.toolRod, TinkerTools.crossbar); tb.addNormalToolRecipe(TinkerTools.cutlass, TinkerTools.swordBlade, TinkerTools.toolRod, TinkerTools.fullGuard); tb.addNormalToolRecipe(TinkerTools.chisel, TinkerTools.chiselHead, TinkerTools.toolRod); - tb.addNormalToolRecipe(TinkerTools.scythe, TinkerTools.scytheBlade, TinkerTools.toughRod, TinkerTools.toughBinding, TinkerTools.toughRod); - tb.addNormalToolRecipe(TinkerTools.lumberaxe, TinkerTools.broadAxeHead, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.toughBinding); - tb.addNormalToolRecipe(TinkerTools.cleaver, TinkerTools.largeSwordBlade, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.toughRod); - tb.addNormalToolRecipe(TinkerTools.excavator, TinkerTools.excavatorHead, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.toughBinding); - tb.addNormalToolRecipe(TinkerTools.hammer, TinkerTools.hammerHead, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.largePlate); - tb.addNormalToolRecipe(TinkerTools.battleaxe, TinkerTools.broadAxeHead, TinkerTools.toughRod, TinkerTools.broadAxeHead, TinkerTools.toughBinding); + tb.addNormalToolRecipe( + TinkerTools.scythe, + TinkerTools.scytheBlade, + TinkerTools.toughRod, + TinkerTools.toughBinding, + TinkerTools.toughRod); + tb.addNormalToolRecipe( + TinkerTools.lumberaxe, + TinkerTools.broadAxeHead, + TinkerTools.toughRod, + TinkerTools.largePlate, + TinkerTools.toughBinding); + tb.addNormalToolRecipe( + TinkerTools.cleaver, + TinkerTools.largeSwordBlade, + TinkerTools.toughRod, + TinkerTools.largePlate, + TinkerTools.toughRod); + tb.addNormalToolRecipe( + TinkerTools.excavator, + TinkerTools.excavatorHead, + TinkerTools.toughRod, + TinkerTools.largePlate, + TinkerTools.toughBinding); + tb.addNormalToolRecipe( + TinkerTools.hammer, + TinkerTools.hammerHead, + TinkerTools.toughRod, + TinkerTools.largePlate, + TinkerTools.largePlate); + tb.addNormalToolRecipe( + TinkerTools.battleaxe, + TinkerTools.broadAxeHead, + TinkerTools.toughRod, + TinkerTools.broadAxeHead, + TinkerTools.toughBinding); ItemStack diamond = new ItemStack(Items.diamond); ModifyBuilder.registerModifier(new ModToolRepair()); - ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7b" + StatCollector.translateToLocal("modifier.tool.diamond"), "\u00a7b")); - ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72" + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72")); + ModifyBuilder.registerModifier(new ModDurability( + new ItemStack[] {diamond}, + 0, + 500, + 0f, + 3, + "Diamond", + "\u00a7b" + StatCollector.translateToLocal("modifier.tool.diamond"), + "\u00a7b")); + ModifyBuilder.registerModifier(new ModDurability( + new ItemStack[] {new ItemStack(Items.emerald)}, + 1, + 0, + 0.5f, + 2, + "Emerald", + "\u00a72" + StatCollector.translateToLocal("modifier.tool.emerald"), + "\u00a72")); ItemStack redstoneItem = new ItemStack(Items.redstone); ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); - ModifyBuilder.registerModifier(new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); - - ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", StatCollector.translateToLocal("modifier.tool.moss"))); + ModifyBuilder.registerModifier( + new ModRedstone(2, new ItemStack[] {redstoneItem, redstoneBlock}, new int[] {1, 9})); + + ModifyBuilder.registerModifier(new ModInteger( + new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 6)}, + 4, + "Moss", + 3, + "\u00a72", + StatCollector.translateToLocal("modifier.tool.moss"))); ItemStack blazePowder = new ItemStack(Items.blaze_powder); - ModifyBuilder.registerModifier(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 })); - ModifyBuilder.registerModifier(new ModAutoSmelt(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 7) }, 6, "Lava", "\u00a74", StatCollector.translateToLocal("modifier.tool.lava"))); - ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", StatCollector.translateToLocal("modifier.tool.necro"))); - - ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free")); - ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1) }, "Tier1.5Free")); - ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { new ItemStack(Items.nether_star) }, "Tier2Free")); - ModifyBuilder.registerModifier(new ModCreativeToolModifier(new ItemStack[] { new ItemStack(TinkerTools.creativeModifier) })); + ModifyBuilder.registerModifier(new ModBlaze(7, new ItemStack[] {blazePowder}, new int[] {1})); + ModifyBuilder.registerModifier(new ModAutoSmelt( + new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 7)}, + 6, + "Lava", + "\u00a74", + StatCollector.translateToLocal("modifier.tool.lava"))); + ModifyBuilder.registerModifier(new ModInteger( + new ItemStack[] {new ItemStack(TinkerTools.materials, 1, 8)}, + 8, + "Necrotic", + 1, + "\u00a78", + StatCollector.translateToLocal("modifier.tool.necro"))); + + ModifyBuilder.registerModifier( + new ModExtraModifier(new ItemStack[] {diamond, new ItemStack(Blocks.gold_block)}, "Tier1Free")); + ModifyBuilder.registerModifier(new ModExtraModifier( + new ItemStack[] {new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1)}, + "Tier1.5Free")); + ModifyBuilder.registerModifier( + new ModExtraModifier(new ItemStack[] {new ItemStack(Items.nether_star)}, "Tier2Free")); + ModifyBuilder.registerModifier( + new ModCreativeToolModifier(new ItemStack[] {new ItemStack(TinkerTools.creativeModifier)})); ItemStack silkyJewel = new ItemStack(TinkerTools.materials, 1, 26); - ModifyBuilder.registerModifier(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); + ModifyBuilder.registerModifier(new ModButtertouch(new ItemStack[] {silkyJewel}, 12)); ItemStack piston = new ItemStack(Blocks.piston); - ModifyBuilder.registerModifier(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 })); + ModifyBuilder.registerModifier(new ModPiston(3, new ItemStack[] {piston}, new int[] {1})); - ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading")); + ModifyBuilder.registerModifier(new ModInteger( + new ItemStack[] {new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl)}, + 13, + "Beheading", + 1, + "\u00a7d", + "Beheading")); ItemStack holySoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); - ModifyBuilder.registerModifier(new ModSmite("Smite", 14, new ItemStack[] { holySoil }, new int[] { 1 })); + ModifyBuilder.registerModifier(new ModSmite("Smite", 14, new ItemStack[] {holySoil}, new int[] {1})); ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye); - ModifyBuilder.registerModifier(new ModAntiSpider("ModAntiSpider", 15, new ItemStack[] { spidereyeball }, new int[] { 1 })); + ModifyBuilder.registerModifier( + new ModAntiSpider("ModAntiSpider", 15, new ItemStack[] {spidereyeball}, new int[] {1})); ItemStack obsidianPlate = new ItemStack(TinkerTools.largePlate, 1, 6); - ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); + ModifyBuilder.registerModifier(new ModReinforced(new ItemStack[] {obsidianPlate}, 16, 1)); TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); } - private void addRecipesForChisel () - { + private void addRecipesForChisel() { /* Detailing */ Detailing chiseling = TConstructRegistry.getChiselDetailing(); chiseling.addDetailing(Blocks.stone, 0, Blocks.stonebrick, 0, TinkerTools.chisel); @@ -571,8 +841,7 @@ private void addRecipesForChisel () chiseling.addDetailing(TinkerTools.materials, 18, TinkerTools.multiBrick, 13, TinkerTools.chisel); // adding multiBrick / multiBrickFanxy meta 0-13 to list - for (int sc = 0; sc < 14; sc++) - { + for (int sc = 0; sc < 14; sc++) { chiseling.addDetailing(TinkerTools.multiBrick, sc, TinkerTools.multiBrickFancy, sc, TinkerTools.chisel); } @@ -585,8 +854,7 @@ private void addRecipesForChisel () * TRepo.multiBrickFancy, 15, TRepo.chisel); */ - if (TinkerSmeltery.smeltery != null) - { + if (TinkerSmeltery.smeltery != null) { chiseling.addDetailing(TinkerSmeltery.smeltery, 4, TinkerSmeltery.smeltery, 6, TinkerTools.chisel); chiseling.addDetailing(TinkerSmeltery.smeltery, 6, TinkerSmeltery.smeltery, 11, TinkerTools.chisel); chiseling.addDetailing(TinkerSmeltery.smeltery, 11, TinkerSmeltery.smeltery, 2, TinkerTools.chisel); @@ -595,7 +863,7 @@ private void addRecipesForChisel () chiseling.addDetailing(TinkerSmeltery.smeltery, 9, TinkerSmeltery.smeltery, 10, TinkerTools.chisel); } - if(TinkerWorld.metalBlock != null) { + if (TinkerWorld.metalBlock != null) { // metal bricks chiseling.addDetailing(TinkerWorld.metalBlock, 8, TinkerTools.multiBrickMetal, 0, TinkerTools.chisel); chiseling.addDetailing(TinkerWorld.metalBlock, 1, TinkerTools.multiBrickMetal, 1, TinkerTools.chisel); @@ -609,10 +877,8 @@ private void addRecipesForChisel () } } - public void vanillaToolRecipes () - { - if (PHConstruct.removeVanillaToolRecipes) - { + public void vanillaToolRecipes() { + if (PHConstruct.removeVanillaToolRecipes) { RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_pickaxe)); RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_axe)); RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_shovel)); @@ -644,8 +910,7 @@ public void vanillaToolRecipes () RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_sword)); } - if (PHConstruct.labotimizeVanillaTools) - { + if (PHConstruct.labotimizeVanillaTools) { Items.wooden_pickaxe.setMaxDamage(1); Items.wooden_axe.setMaxDamage(1); Items.wooden_shovel.setMaxDamage(1); @@ -678,124 +943,423 @@ public void vanillaToolRecipes () } } - public static void registerPatternMaterial (String oreName, int value, String materialName) - { - for (ItemStack ore : OreDictionary.getOres(oreName)) - { + public static void registerPatternMaterial(String oreName, int value, String materialName) { + for (ItemStack ore : OreDictionary.getOres(oreName)) { PatternBuilder.instance.registerMaterial(ore, value, materialName); } } - private void craftingTableRecipes () - { - String[] patBlock = { "###", "###", "###" }; - String[] patSurround = { "###", "#m#", "###" }; - - Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; - - ItemStack smelteryStack = TinkerSmeltery.smeltery != null ? new ItemStack(TinkerSmeltery.smeltery, 1, 2) : new ItemStack(Blocks.obsidian, 1, 0); + private void craftingTableRecipes() { + String[] patBlock = {"###", "###", "###"}; + String[] patSurround = {"###", "#m#", "###"}; + + Object[] toolForgeBlocks = { + "blockIron", + "blockGold", + Blocks.diamond_block, + Blocks.emerald_block, + "blockCobalt", + "blockArdite", + "blockManyullyn", + "blockCopper", + "blockBronze", + "blockTin", + "blockAluminum", + "blockAluminumBrass", + "blockAlumite", + "blockSteel" + }; + + ItemStack smelteryStack = TinkerSmeltery.smeltery != null + ? new ItemStack(TinkerSmeltery.smeltery, 1, 2) + : new ItemStack(Blocks.obsidian, 1, 0); // ToolForge Recipes (Metal Version) - for (int sc = 0; sc < toolForgeBlocks.length; sc++) - { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolForge, 1, sc), "bbb", "msm", "m m", 'b', smelteryStack, 's', new ItemStack(TinkerTools.toolStationWood, 1, 0), 'm', toolForgeBlocks[sc])); + for (int sc = 0; sc < toolForgeBlocks.length; sc++) { + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.toolForge, 1, sc), + "bbb", + "msm", + "m m", + 'b', + smelteryStack, + 's', + new ItemStack(TinkerTools.toolStationWood, 1, 0), + 'm', + toolForgeBlocks[sc])); // adding slab version recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', smelteryStack, 's', new ItemStack(TinkerTools.craftingSlabWood, 1, 1), 'm', toolForgeBlocks[sc])); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 5), + "bbb", + "msm", + "m m", + 'b', + smelteryStack, + 's', + new ItemStack(TinkerTools.craftingSlabWood, 1, 1), + 'm', + toolForgeBlocks[sc])); } // ToolStation Recipes (Wooden Version) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(TinkerTools.craftingStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(TinkerTools.craftingSlabWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "chestWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "logWood")); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "plankWood")); - GameRegistry.addRecipe(new ItemStack(TinkerTools.furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Blocks.stone_slab, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 0), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 0), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "craftingTableWood")); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 0), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(TinkerTools.craftingStationWood, 1, 0)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 0), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(TinkerTools.craftingSlabWood, 1, 0)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 2), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.log, 1, 1)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 3), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.log, 1, 2)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 4), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.log, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 5), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "chestWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 1), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "logWood")); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 10), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.planks, 1, 0)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 11), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.planks, 1, 1)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 12), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.planks, 1, 2)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 13), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + new ItemStack(Blocks.planks, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.toolStationWood, 1, 10), + "p", + "w", + 'p', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'w', + "plankWood")); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.furnaceSlab, 1, 0), + "###", + "# #", + "###", + '#', + new ItemStack(Blocks.stone_slab, 1, 3)); // Blank Pattern Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.blankPattern, 4, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.blankPattern, 4, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); // Manual Book Recipes - GameRegistry.addRecipe(new ItemStack(TinkerTools.manualBook), "wp", 'w', new ItemStack(TinkerTools.blankPattern, 1, 0), 'p', Items.paper); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 0), new ItemStack(TinkerTools.manualBook, 1, 0), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 1), new ItemStack(TinkerTools.manualBook, 1, 1), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 2), new ItemStack(TinkerTools.manualBook, 1, 2), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 2, 4), new ItemStack(TinkerTools.manualBook, 1, 4), Items.book); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 4), new ItemStack(TinkerTools.manualBook, 1, 2)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.manualBook, 1, 3), new ItemStack(TinkerTools.manualBook, 1, 4)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.manualBook), + "wp", + 'w', + new ItemStack(TinkerTools.blankPattern, 1, 0), + 'p', + Items.paper); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 2, 0), new ItemStack(TinkerTools.manualBook, 1, 0), Items.book); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 2, 1), new ItemStack(TinkerTools.manualBook, 1, 1), Items.book); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 2, 2), new ItemStack(TinkerTools.manualBook, 1, 2), Items.book); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 2, 4), new ItemStack(TinkerTools.manualBook, 1, 4), Items.book); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 1, 4), new ItemStack(TinkerTools.manualBook, 1, 2)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.manualBook, 1, 3), new ItemStack(TinkerTools.manualBook, 1, 4)); // alternative Vanilla Book Recipe - GameRegistry.addShapelessRecipe(new ItemStack(Items.book), Items.paper, Items.paper, Items.paper, Items.string, TinkerTools.blankPattern, TinkerTools.blankPattern); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.name_tag), "P~ ", "~O ", " ~", '~', Items.string, 'P', Items.paper, 'O', "slimeball")); + GameRegistry.addShapelessRecipe( + new ItemStack(Items.book), + Items.paper, + Items.paper, + Items.paper, + Items.string, + TinkerTools.blankPattern, + TinkerTools.blankPattern); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(Items.name_tag), + "P~ ", + "~O ", + " ~", + '~', + Items.string, + 'P', + Items.paper, + 'O', + "slimeball")); // Paperstack Recipe GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 0), "pp", "pp", 'p', Items.paper); // Mossball Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.materials, 1, 6), patBlock, '#', "stoneMossy")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerTools.materials, 1, 6), patBlock, '#', "stoneMossy")); // LavaCrystal Recipes -Auto-smelt - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'c', Items.fire_charge, 'x', Items.blaze_rod); - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fire_charge, 'c', Items.blaze_rod); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 7), + "xcx", + "cbc", + "xcx", + 'b', + Items.lava_bucket, + 'c', + Items.fire_charge, + 'x', + Items.blaze_rod); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 7), + "xcx", + "cbc", + "xcx", + 'b', + Items.lava_bucket, + 'x', + Items.fire_charge, + 'c', + Items.blaze_rod); // Slimy sand Recipes - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 0), Items.slime_ball, Items.slime_ball, Items.slime_ball, Items.slime_ball, Blocks.sand, Blocks.dirt); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 2), TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, Blocks.sand, Blocks.dirt); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 1, 0), + Items.slime_ball, + Items.slime_ball, + Items.slime_ball, + Items.slime_ball, + Blocks.sand, + Blocks.dirt); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 1, 2), + TinkerWorld.strangeFood, + TinkerWorld.strangeFood, + TinkerWorld.strangeFood, + TinkerWorld.strangeFood, + Blocks.sand, + Blocks.dirt); // Grout Recipes - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.gravel, Blocks.gravel, Blocks.gravel, Blocks.gravel); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, Blocks.soul_sand, Blocks.gravel); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 8, 1), + new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), + Blocks.sand, + Blocks.sand, + Blocks.sand, + Blocks.sand, + Blocks.gravel, + Blocks.gravel, + Blocks.gravel, + Blocks.gravel); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, Blocks.soul_sand, Blocks.gravel); // Graveyard Soil Recipes - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 3), Blocks.dirt, Items.rotten_flesh, new ItemStack(Items.dye, 1, 15)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerTools.craftedSoil, 1, 3), + Blocks.dirt, + Items.rotten_flesh, + new ItemStack(Items.dye, 1, 15)); // Silky Cloth Recipes - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 25), patSurround, 'm', new ItemStack(TinkerTools.materials, 1, 24), '#', new ItemStack(Items.string)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Items.string))); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 25), + patSurround, + 'm', + new ItemStack(TinkerTools.materials, 1, 24), + '#', + new ItemStack(Items.string)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.materials, 1, 25), + patSurround, + 'm', + "nuggetGold", + '#', + new ItemStack(Items.string))); // Silky Jewel Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(TinkerTools.materials, 1, 25), 'e', "gemEmerald")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.materials, 1, 26), + " c ", + "cec", + " c ", + 'c', + new ItemStack(TinkerTools.materials, 1, 25), + 'e', + "gemEmerald")); // Advanced WorkBench Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); // Slab crafters - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 0), "b", 'b', new ItemStack(TinkerTools.craftingStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 1), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 0)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 3)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 2), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 4)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 4), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 5)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 10)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 11)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 12)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 13)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "b", 'b', new ItemStack(TinkerTools.toolForge, 1, Short.MAX_VALUE)); - - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminium", "dustAluminium", "dustAluminium", "dustCopper")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 0), + "b", + 'b', + new ItemStack(TinkerTools.craftingStationWood, 1, 0)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 1), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 0)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 2), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 1)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 2), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 2)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 2), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 3)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 2), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 4)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 4), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 5)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 3), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 10)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 3), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 11)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 3), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 12)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 3), + "b", + 'b', + new ItemStack(TinkerTools.toolStationWood, 1, 13)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.craftingSlabWood, 1, 5), + "b", + 'b', + new ItemStack(TinkerTools.toolForge, 1, Short.MAX_VALUE)); + + GameRegistry.addRecipe( + new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerTools.materials, 4, 42), + "dustAluminium", + "dustAluminium", + "dustAluminium", + "dustCopper")); } - private void modIntegration () - { + private void modIntegration() { /* TE3 Flux */ ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); - if (batHardened != null) - { + if (batHardened != null) { TinkerTools.modFlux.batteries.add(batHardened); } ItemStack basicCell = GameRegistry.findItemStack("ThermalExpansion", "cellBasic", 1); - if (basicCell != null) - { + if (basicCell != null) { TinkerTools.modFlux.batteries.add(basicCell); } - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.binding, 1, 6), ""); + ItemStack ironpick = ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.pickaxeHead, 1, 6), + new ItemStack(TinkerTools.toolRod, 1, 2), + new ItemStack(TinkerTools.binding, 1, 6), + ""); if (batHardened != null) TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); if (basicCell != null) @@ -803,78 +1367,123 @@ private void modIntegration () /* Thaumcraft */ Object obj = ItemHelper.getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); - if (obj != null) - { + if (obj != null) { TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); TinkerTools.thaumcraftAvailable = true; TConstructClientRegistry.addMaterialRenderMapping(MaterialID.Thaumium, "tinker", "thaumium", true); - TConstructRegistry.addToolMaterial(MaterialID.Thaumium, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", 0x51437c); - PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(TinkerTools.toolShard, 1, 31), new ItemStack(TinkerTools.toolRod, 1, 31), 31); - for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) - { + TConstructRegistry.addToolMaterial( + MaterialID.Thaumium, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", 0x51437c); + PatternBuilder.instance.registerFullMaterial( + new ItemStack((Item) obj, 1, 2), + 2, + "Thaumium", + new ItemStack(TinkerTools.toolShard, 1, 31), + new ItemStack(TinkerTools.toolRod, 1, 31), + 31); + for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++) { if (TinkerTools.patternOutputs[meta] != null) - TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, 31, new ItemStack(TinkerTools.patternOutputs[meta], 1, 31)); + TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + meta + 1, + 31, + new ItemStack(TinkerTools.patternOutputs[meta], 1, 31)); } // Thaumium weaponry toolparts - if(TConstruct.pulsar.isPulseLoaded("Tinkers' Weaponry")) - { + if (TConstruct.pulsar.isPulseLoaded("Tinkers' Weaponry")) { for (int m = 0; m < TinkerWeaponry.patternOutputs.length; m++) - TConstructRegistry.addPartMapping(TinkerWeaponry.woodPattern, m, MaterialID.Thaumium, new ItemStack(TinkerWeaponry.patternOutputs[m], 1, MaterialID.Thaumium)); - - TConstructRegistry.addPartMapping(TinkerTools.woodPattern, 25, MaterialID.Thaumium, new ItemStack(TinkerWeaponry.arrowhead, 1, MaterialID.Thaumium)); - - TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerWeaponry.bowstring, 1, 1), 1F, 0.8F, 0.9f, 0x63bcd9); + TConstructRegistry.addPartMapping( + TinkerWeaponry.woodPattern, + m, + MaterialID.Thaumium, + new ItemStack(TinkerWeaponry.patternOutputs[m], 1, MaterialID.Thaumium)); + + TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, + 25, + MaterialID.Thaumium, + new ItemStack(TinkerWeaponry.arrowhead, 1, MaterialID.Thaumium)); + + TConstructRegistry.addBowstringMaterial( + 1, + 2, + new ItemStack((Item) obj, 1, 7), + new ItemStack(TinkerWeaponry.bowstring, 1, 1), + 1F, + 0.8F, + 0.9f, + 0x63bcd9); TConstructRegistry.addBowMaterial(31, 35, 4.75f); TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F); } TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Thaumium); TConstructRegistry.addDefaultShardMaterial(MaterialID.Thaumium); - } - else - { + } else { TConstruct.logger.warn("Thaumcraft not detected."); } - if (Loader.isModLoaded("Natura")) - { - try - { + if (Loader.isModLoaded("Natura")) { + try { Object plantItem = ItemHelper.getStaticItem("plantItem", "mods.natura.common.NContent"); - TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(TinkerWeaponry.bowstring, 1, 2), 1.2F, 1.1F, 1.2f, 0xf3414f); - } - catch (Exception e) - { + TConstructRegistry.addBowstringMaterial( + 2, + 2, + new ItemStack((Item) plantItem, 1, 7), + new ItemStack(TinkerWeaponry.bowstring, 1, 2), + 1.2F, + 1.1F, + 1.2f, + 0xf3414f); + } catch (Exception e) { } // No need to handle } - - //OpenBlocks + + // OpenBlocks openBlocksDevNull = GameRegistry.findItem("OpenBlocks", "devnull"); } - void registerMaterials () - { - // Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, style color, primary color for block use - TConstructRegistry.addToolMaterial(MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, YELLOW.toString(), 0x755821); - TConstructRegistry.addToolMaterial(MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, GRAY.toString(), 0x7F7F7F); - TConstructRegistry.addToolMaterial(MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, WHITE.toString(), 0xDADADA); - TConstructRegistry.addToolMaterial(MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, DARK_GRAY.toString(), 0x484848); - TConstructRegistry.addToolMaterial(MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, DARK_GREEN.toString(), 0x12690b); - TConstructRegistry.addToolMaterial(MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, YELLOW.toString(), 0xEDEBCA); - TConstructRegistry.addToolMaterial(MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, LIGHT_PURPLE.toString(), 0xaa7ff5); - TConstructRegistry.addToolMaterial(MaterialID.Netherrack, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, DARK_RED.toString(), 0x833238); - TConstructRegistry.addToolMaterial(MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, GREEN.toString(), 0x6EB065); - TConstructRegistry.addToolMaterial(MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, WHITE.toString(), 0xFFFFFF); - TConstructRegistry.addToolMaterial(MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, DARK_AQUA.toString(), 0x2376DD); - TConstructRegistry.addToolMaterial(MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, DARK_RED.toString(), 0xA53000); - TConstructRegistry.addToolMaterial(MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, DARK_PURPLE.toString(), 0x7338A5); - TConstructRegistry.addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString(), 0xCC6410); - TConstructRegistry.addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString(), 0xCA9956); - TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString(), 0xffa7e9); - TConstructRegistry.addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString(), 0xA0A0A0); - TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString(), 0x66AEB0); - TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString(), 0xF0A8A4); + void registerMaterials() { + // Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, style + // color, primary color for block use + TConstructRegistry.addToolMaterial( + MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, YELLOW.toString(), 0x755821); + TConstructRegistry.addToolMaterial( + MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, GRAY.toString(), 0x7F7F7F); + TConstructRegistry.addToolMaterial( + MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, WHITE.toString(), 0xDADADA); + TConstructRegistry.addToolMaterial( + MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, DARK_GRAY.toString(), 0x484848); + TConstructRegistry.addToolMaterial( + MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, DARK_GREEN.toString(), 0x12690b); + TConstructRegistry.addToolMaterial( + MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, YELLOW.toString(), 0xEDEBCA); + TConstructRegistry.addToolMaterial( + MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, LIGHT_PURPLE.toString(), 0xaa7ff5); + TConstructRegistry.addToolMaterial( + MaterialID.Netherrack, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, DARK_RED.toString(), 0x833238); + TConstructRegistry.addToolMaterial( + MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, GREEN.toString(), 0x6EB065); + TConstructRegistry.addToolMaterial( + MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, WHITE.toString(), 0xFFFFFF); + TConstructRegistry.addToolMaterial( + MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, DARK_AQUA.toString(), 0x2376DD); + TConstructRegistry.addToolMaterial( + MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, DARK_RED.toString(), 0xA53000); + TConstructRegistry.addToolMaterial( + MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, DARK_PURPLE.toString(), 0x7338A5); + TConstructRegistry.addToolMaterial( + MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString(), 0xCC6410); + TConstructRegistry.addToolMaterial( + MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString(), 0xCA9956); + TConstructRegistry.addToolMaterial( + MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString(), 0xffa7e9); + TConstructRegistry.addToolMaterial( + MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString(), 0xA0A0A0); + TConstructRegistry.addToolMaterial( + MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString(), 0x66AEB0); + TConstructRegistry.addToolMaterial( + MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString(), 0xF0A8A4); // Register all the materials for default toolparts TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Wood); @@ -894,23 +1503,22 @@ void registerMaterials () TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Bronze); TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Alumite); TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Steel); - TConstructRegistry.addDefaultToolPartMaterial(MaterialID.BlueSlime ); + TConstructRegistry.addDefaultToolPartMaterial(MaterialID.BlueSlime); TConstructRegistry.addDefaultToolPartMaterial(MaterialID.PigIron); // Register all the materials for default toolparts - //TConstructRegistry.addDefaultShardMaterial(MaterialID.Wood); + // TConstructRegistry.addDefaultShardMaterial(MaterialID.Wood); TConstructRegistry.addDefaultShardMaterial(MaterialID.Stone); TConstructRegistry.addDefaultShardMaterial(MaterialID.Flint); TConstructRegistry.addDefaultShardMaterial(MaterialID.Cactus); - //TConstructRegistry.addDefaultShardMaterial(MaterialID.Bone); + // TConstructRegistry.addDefaultShardMaterial(MaterialID.Bone); TConstructRegistry.addDefaultShardMaterial(MaterialID.Obsidian); TConstructRegistry.addDefaultShardMaterial(MaterialID.Netherrack); TConstructRegistry.addDefaultShardMaterial(MaterialID.Slime); - //TConstructRegistry.addDefaultShardMaterial(MaterialID.Paper); - TConstructRegistry.addDefaultShardMaterial(MaterialID.BlueSlime ); + // TConstructRegistry.addDefaultShardMaterial(MaterialID.Paper); + TConstructRegistry.addDefaultShardMaterial(MaterialID.BlueSlime); - if(PHConstruct.craftMetalTools) - { + if (PHConstruct.craftMetalTools) { TConstructRegistry.addDefaultShardMaterial(MaterialID.Iron); TConstructRegistry.addDefaultShardMaterial(MaterialID.Cobalt); TConstructRegistry.addDefaultShardMaterial(MaterialID.Ardite); @@ -924,41 +1532,95 @@ void registerMaterials () PatternBuilder pb = PatternBuilder.instance; if (PHConstruct.enableTWood) - pb.registerFullMaterial(Blocks.planks, 2, "Wood", new ItemStack(Items.stick), new ItemStack(Items.stick), 0); - else - pb.registerMaterialSet("Wood", new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); - if (PHConstruct.enableTStone) - { - pb.registerFullMaterial(Blocks.stone, 2, "Stone", new ItemStack(TinkerTools.toolShard, 1, 1), new ItemStack(TinkerTools.toolRod, 1, 1), 1); + pb.registerFullMaterial( + Blocks.planks, 2, "Wood", new ItemStack(Items.stick), new ItemStack(Items.stick), 0); + else pb.registerMaterialSet("Wood", new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0); + if (PHConstruct.enableTStone) { + pb.registerFullMaterial( + Blocks.stone, + 2, + "Stone", + new ItemStack(TinkerTools.toolShard, 1, 1), + new ItemStack(TinkerTools.toolRod, 1, 1), + 1); pb.registerMaterial(Blocks.cobblestone, 2, "Stone"); - } - else - pb.registerMaterialSet("Stone", new ItemStack(TinkerTools.toolShard, 1, 1), new ItemStack(TinkerTools.toolRod, 1, 1), 1); - pb.registerFullMaterial(Items.iron_ingot, 2, "Iron", new ItemStack(TinkerTools.toolShard, 1, 2), new ItemStack(TinkerTools.toolRod, 1, 2), 2); + } else + pb.registerMaterialSet( + "Stone", new ItemStack(TinkerTools.toolShard, 1, 1), new ItemStack(TinkerTools.toolRod, 1, 1), 1); + pb.registerFullMaterial( + Items.iron_ingot, + 2, + "Iron", + new ItemStack(TinkerTools.toolShard, 1, 2), + new ItemStack(TinkerTools.toolRod, 1, 2), + 2); if (PHConstruct.enableTFlint) - pb.registerFullMaterial(Items.flint, 2, "Flint", new ItemStack(TinkerTools.toolShard, 1, 3), new ItemStack(TinkerTools.toolRod, 1, 3), 3); + pb.registerFullMaterial( + Items.flint, + 2, + "Flint", + new ItemStack(TinkerTools.toolShard, 1, 3), + new ItemStack(TinkerTools.toolRod, 1, 3), + 3); else - pb.registerMaterialSet("Flint", new ItemStack(TinkerTools.toolShard, 1, 3), new ItemStack(TinkerTools.toolRod, 1, 3), 3); + pb.registerMaterialSet( + "Flint", new ItemStack(TinkerTools.toolShard, 1, 3), new ItemStack(TinkerTools.toolRod, 1, 3), 3); if (PHConstruct.enableTCactus) - pb.registerFullMaterial(Blocks.cactus, 2, "Cactus", new ItemStack(TinkerTools.toolShard, 1, 4), new ItemStack(TinkerTools.toolRod, 1, 4), 4); + pb.registerFullMaterial( + Blocks.cactus, + 2, + "Cactus", + new ItemStack(TinkerTools.toolShard, 1, 4), + new ItemStack(TinkerTools.toolRod, 1, 4), + 4); else - pb.registerMaterialSet("Cactus", new ItemStack(TinkerTools.toolShard, 1, 4), new ItemStack(TinkerTools.toolRod, 1, 4), 4); + pb.registerMaterialSet( + "Cactus", new ItemStack(TinkerTools.toolShard, 1, 4), new ItemStack(TinkerTools.toolRod, 1, 4), 4); if (PHConstruct.enableTBone) - pb.registerFullMaterial(Items.bone, 2, "Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); - else - pb.registerMaterialSet("Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); - pb.registerFullMaterial(Blocks.obsidian, 2, "Obsidian", new ItemStack(TinkerTools.toolShard, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 6), 6); + pb.registerFullMaterial( + Items.bone, 2, "Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + else pb.registerMaterialSet("Bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5); + pb.registerFullMaterial( + Blocks.obsidian, + 2, + "Obsidian", + new ItemStack(TinkerTools.toolShard, 1, 6), + new ItemStack(TinkerTools.toolRod, 1, 6), + 6); pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian"); if (PHConstruct.enableTNetherrack) - pb.registerFullMaterial(Blocks.netherrack, 2, "Netherrack", new ItemStack(TinkerTools.toolShard, 1, 7), new ItemStack(TinkerTools.toolRod, 1, 7), 7); + pb.registerFullMaterial( + Blocks.netherrack, + 2, + "Netherrack", + new ItemStack(TinkerTools.toolShard, 1, 7), + new ItemStack(TinkerTools.toolRod, 1, 7), + 7); else - pb.registerMaterialSet("Netherrack", new ItemStack(TinkerTools.toolShard, 1, 7), new ItemStack(TinkerTools.toolRod, 1, 7), 7); + pb.registerMaterialSet( + "Netherrack", + new ItemStack(TinkerTools.toolShard, 1, 7), + new ItemStack(TinkerTools.toolRod, 1, 7), + 7); if (PHConstruct.enableTSlime) - pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8); + pb.registerFullMaterial( + new ItemStack(materials, 1, 1), + 2, + "Slime", + new ItemStack(toolShard, 1, 8), + new ItemStack(toolRod, 1, 8), + 8); else - pb.registerMaterialSet("Slime", new ItemStack(TinkerTools.toolShard, 1, 8), new ItemStack(TinkerTools.toolRod, 1, 17), 8); + pb.registerMaterialSet( + "Slime", new ItemStack(TinkerTools.toolShard, 1, 8), new ItemStack(TinkerTools.toolRod, 1, 17), 8); if (PHConstruct.enableTPaper) - pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Items.paper, 2), new ItemStack(toolRod, 1, 9), 9); + pb.registerFullMaterial( + new ItemStack(materials, 1, 0), + 2, + "Paper", + new ItemStack(Items.paper, 2), + new ItemStack(toolRod, 1, 9), + 9); else pb.registerMaterialSet("Paper", new ItemStack(Items.paper, 2), new ItemStack(TinkerTools.toolRod, 1, 9), 9); pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10); @@ -969,16 +1631,31 @@ void registerMaterials () pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15); pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16); if (PHConstruct.enableTBlueSlime) - pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17); + pb.registerFullMaterial( + new ItemStack(materials, 1, 17), + 2, + "BlueSlime", + new ItemStack(toolShard, 1, 17), + new ItemStack(toolRod, 1, 17), + 17); else - pb.registerMaterialSet("BlueSlime", new ItemStack(TinkerTools.toolShard, 1, 17), new ItemStack(TinkerTools.toolRod, 1, 17), 17); - pb.registerFullMaterial(new ItemStack(materials, 1, 34), 2, "PigIron", new ItemStack(toolShard, 1, 18), new ItemStack(toolRod, 1, 18), 18); + pb.registerMaterialSet( + "BlueSlime", + new ItemStack(TinkerTools.toolShard, 1, 17), + new ItemStack(TinkerTools.toolRod, 1, 17), + 17); + pb.registerFullMaterial( + new ItemStack(materials, 1, 34), + 2, + "PigIron", + new ItemStack(toolShard, 1, 18), + new ItemStack(toolRod, 1, 18), + 18); pb.addToolPattern((IPattern) TinkerTools.woodPattern); } - private void registerStencils () - { + private void registerStencils() { StencilBuilder.registerBlankStencil(new ItemStack(TinkerTools.blankPattern)); // we register this manually because we want that specific order @@ -1010,8 +1687,7 @@ private void registerStencils () StencilBuilder.registerStencil(20, TinkerTools.woodPattern, 6); // wide guard } - public static final class MaterialID - { + public static final class MaterialID { public static final int Wood = 0; public static final int Stone = 1; public static final int Iron = 2; diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index b14dfc231f2..7b1524b031b 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -1,5 +1,7 @@ package tconstruct.tools; +import static tconstruct.tools.TinkerTools.*; + import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import mantle.client.MProxyClient; @@ -15,7 +17,6 @@ import net.minecraftforge.common.MinecraftForge; import tconstruct.TConstruct; import tconstruct.client.FlexibleToolRenderer; -import tconstruct.client.ToolCoreRenderer; import tconstruct.client.entity.projectile.*; import tconstruct.client.pages.*; import tconstruct.common.TProxyCommon; @@ -31,13 +32,9 @@ import tconstruct.tools.model.*; import tconstruct.weaponry.TinkerWeaponry; -import static tconstruct.tools.TinkerTools.*; - -public class ToolProxyClient extends ToolProxyCommon -{ +public class ToolProxyClient extends ToolProxyCommon { @Override - public void initialize () - { + public void initialize() { MinecraftForge.EVENT_BUS.register(this); registerRenderer(); registerGuiHandler(); @@ -48,19 +45,19 @@ public void initialize () addToolButtons(); } - public void registerRenderer () - { + public void registerRenderer() { RenderingRegistry.registerBlockHandler(new TableRender()); RenderingRegistry.registerBlockHandler(new FrypanRender()); RenderingRegistry.registerBlockHandler(new BattlesignRender()); - RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Items.potionitem, 16384)); + RenderingRegistry.registerEntityRenderingHandler( + LaunchedPotion.class, new LaunchedItemRender(Items.potionitem, 16384)); RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerEntityRenderer()); - //RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom()); - //RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom()); + // RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom()); + // RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom()); RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender()); - //MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer()); + // MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer()); FlexibleToolRenderer renderer = new FlexibleToolRenderer(); MinecraftForgeClient.registerItemRenderer(TinkerTools.pickaxe, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.shovel, renderer); @@ -80,36 +77,147 @@ public void registerRenderer () MinecraftForgeClient.registerItemRenderer(TinkerTools.rapier, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.scythe, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer); - //ToolCoreRenderer daggerRenderer = new ToolCoreRenderer(true); - //MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, daggerRenderer); // todo proper renderer + // ToolCoreRenderer daggerRenderer = new ToolCoreRenderer(true); + // MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, daggerRenderer); // todo proper renderer TileEntityRendererDispatcher.instance.mapSpecialRenderers.put(BattlesignLogic.class, new BattlesignTesr()); } - public void registerManualIcons () - { + public void registerManualIcons() { // ToolIcons - MantleClientRegistry.registerManualIcon("pickicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.binding, 1, 12), "")); - MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.shovelHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("mattockicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.shovelHead, 1, 12), "")); - MantleClientRegistry.registerManualIcon("swordicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.wideGuard, 1, 12), "")); - MantleClientRegistry.registerManualIcon("longswordicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.handGuard, 1, 12), "")); - MantleClientRegistry.registerManualIcon("rapiericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); - MantleClientRegistry.registerManualIcon("daggerIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); - MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.frypanHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.signHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.chiselHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - //MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerWeaponry.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), "")); - //MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerWeaponry.fletching, 1, 0), "")); - - MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hammerHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.largePlate, 8), "")); - MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); - MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.excavatorHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); - MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.scytheBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.toughBinding, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); - MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.largeSwordBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); - MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.broadAxeHead, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon( + "pickicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.pickaxeHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + new ItemStack(TinkerTools.binding, 1, 12), + "")); + MantleClientRegistry.registerManualIcon( + "shovelicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.shovelHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + null, + "")); + MantleClientRegistry.registerManualIcon( + "axeicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.hatchetHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + null, + "")); + MantleClientRegistry.registerManualIcon( + "mattockicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.hatchetHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + new ItemStack(TinkerTools.shovelHead, 1, 12), + "")); + MantleClientRegistry.registerManualIcon( + "swordicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.swordBlade, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + new ItemStack(TinkerTools.wideGuard, 1, 12), + "")); + MantleClientRegistry.registerManualIcon( + "longswordicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.swordBlade, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + new ItemStack(TinkerTools.handGuard, 1, 12), + "")); + MantleClientRegistry.registerManualIcon( + "rapiericon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.swordBlade, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + new ItemStack(TinkerTools.crossbar, 1, 12), + "")); + MantleClientRegistry.registerManualIcon( + "daggerIcon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.knifeBlade, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + new ItemStack(TinkerTools.crossbar, 1, 12), + "")); + MantleClientRegistry.registerManualIcon( + "frypanicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.frypanHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + null, + "")); + MantleClientRegistry.registerManualIcon( + "battlesignicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.signHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + null, + "")); + MantleClientRegistry.registerManualIcon( + "chiselicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.chiselHead, 1, 10), + new ItemStack(TinkerTools.toolRod, 1, 11), + null, + "")); + // MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new + // ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerWeaponry.bowstring, 1, 0), new + // ItemStack(TinkerTools.toolRod, 1, 12), "")); + // MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new + // ItemStack(TinkerWeaponry.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new + // ItemStack(TinkerWeaponry.fletching, 1, 0), "")); + + MantleClientRegistry.registerManualIcon( + "hammericon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.hammerHead, 1, 10), + new ItemStack(TinkerTools.toughRod, 1, 11), + new ItemStack(TinkerTools.largePlate, 1, 12), + new ItemStack(TinkerTools.largePlate, 8), + "")); + MantleClientRegistry.registerManualIcon( + "lumbericon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.broadAxeHead, 1, 10), + new ItemStack(TinkerTools.toughRod, 1, 11), + new ItemStack(TinkerTools.largePlate, 1, 12), + new ItemStack(TinkerTools.toughBinding, 8), + "")); + MantleClientRegistry.registerManualIcon( + "excavatoricon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.excavatorHead, 1, 10), + new ItemStack(TinkerTools.toughRod, 1, 11), + new ItemStack(TinkerTools.largePlate, 1, 12), + new ItemStack(TinkerTools.toughBinding, 8), + "")); + MantleClientRegistry.registerManualIcon( + "scytheicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.scytheBlade, 1, 10), + new ItemStack(TinkerTools.toughRod, 1, 11), + new ItemStack(TinkerTools.toughBinding, 1, 12), + new ItemStack(TinkerTools.toughRod, 8), + "")); + MantleClientRegistry.registerManualIcon( + "cleavericon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.largeSwordBlade, 1, 10), + new ItemStack(TinkerTools.toughRod, 1, 11), + new ItemStack(TinkerTools.largePlate, 1, 12), + new ItemStack(TinkerTools.toughRod, 8), + "")); + MantleClientRegistry.registerManualIcon( + "battleaxeicon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.broadAxeHead, 1, 10), + new ItemStack(TinkerTools.toughRod, 1, 11), + new ItemStack(TinkerTools.broadAxeHead, 1, 12), + new ItemStack(TinkerTools.toughBinding, 8), + "")); // Tool parts MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TinkerTools.pickaxeHead, 1, 2)); @@ -142,14 +250,14 @@ public void registerManualIcons () MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TinkerWeaponry.arrowhead, 1, 2)); MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TinkerWeaponry.fletching, 1, 0)); - //Tables + // Tables MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TinkerTools.blankPattern, 1, 0)); MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0)); MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1)); MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5)); MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10)); - //TODO: Untwine this + // TODO: Untwine this MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TinkerTools.materials, 1, 17)); MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1)); MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TinkerTools.materials, 1, 0)); @@ -170,8 +278,7 @@ public void registerManualIcons () MProxyClient.registerManualPage("modifier", ModifierPage.class); } - void registerManualRecipes () - { + void registerManualRecipes() { ItemStack pattern = new ItemStack(TinkerTools.blankPattern, 1, 0); ItemStack silkyCloth = new ItemStack(TinkerTools.materials, 1, 25); @@ -193,67 +300,204 @@ void registerManualRecipes () ItemStack sand = new ItemStack(Blocks.sand, 1, 0); ItemStack searedbrickBlock = new ItemStack(TinkerSmeltery.smeltery, 1, 2); - MantleClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Items.book), paper, paper, paper, string, pattern, pattern, null, null, null); - MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TinkerTools.manualBook, 1, 0), new ItemStack(Items.paper), pattern, null, null); - MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0), null, null, null); - MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1), null, null, null); + MantleClientRegistry.registerManualLargeRecipe( + "alternatebook", + new ItemStack(Items.book), + paper, + paper, + paper, + string, + pattern, + pattern, + null, + null, + null); + MantleClientRegistry.registerManualSmallRecipe( + "patternbook1", + new ItemStack(TinkerTools.manualBook, 1, 0), + new ItemStack(Items.paper), + pattern, + null, + null); + MantleClientRegistry.registerManualSmallRecipe( + "patternbook2", + new ItemStack(TinkerTools.manualBook, 1, 1), + new ItemStack(TinkerTools.manualBook, 1, 0), + null, + null, + null); + MantleClientRegistry.registerManualSmallRecipe( + "patternbook3", + new ItemStack(TinkerTools.manualBook, 1, 2), + new ItemStack(TinkerTools.manualBook, 1, 1), + null, + null, + null); MantleClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); - MantleClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0), null, pattern, null, workbench); - MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1), null, pattern, null, log); - MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5), null, pattern, null, chest); - MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10), null, pattern, null, plank); - - MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TinkerTools.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(TinkerTools.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); //TODO: Alternate recipe for Smeltery disabled - - MantleClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); - MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud); - MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TinkerTools.materials, 1, 0), paper, paper, paper, paper); - MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TinkerTools.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble); - MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge, blazerod, firecharge, blazerod); - MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TinkerTools.materials, 1, 24), string, string, string, string); - MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TinkerTools.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null, silkyCloth, null); + MantleClientRegistry.registerManualSmallRecipe( + "toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0), null, pattern, null, workbench); + MantleClientRegistry.registerManualSmallRecipe( + "partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1), null, pattern, null, log); + MantleClientRegistry.registerManualSmallRecipe( + "patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5), null, pattern, null, chest); + MantleClientRegistry.registerManualSmallRecipe( + "stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10), null, pattern, null, plank); + + MantleClientRegistry.registerManualLargeRecipe( + "toolforge", + new ItemStack(TinkerTools.toolForge, 1, 0), + searedbrickBlock, + searedbrickBlock, + searedbrickBlock, + ironblock, + new ItemStack(TinkerTools.toolStationWood, 1, 0), + ironblock, + ironblock, + null, + ironblock); // TODO: Alternate recipe for Smeltery disabled + + MantleClientRegistry.registerManualLargeRecipe( + "slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); + MantleClientRegistry.registerManualFurnaceRecipe( + "slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud); + MantleClientRegistry.registerManualSmallRecipe( + "paperstack", new ItemStack(TinkerTools.materials, 1, 0), paper, paper, paper, paper); + MantleClientRegistry.registerManualLargeRecipe( + "mossball", + new ItemStack(TinkerTools.materials, 1, 6), + mossycobble, + mossycobble, + mossycobble, + mossycobble, + mossycobble, + mossycobble, + mossycobble, + mossycobble, + mossycobble); + MantleClientRegistry.registerManualLargeRecipe( + "lavacrystal", + new ItemStack(TinkerTools.materials, 1, 7), + blazerod, + firecharge, + blazerod, + firecharge, + new ItemStack(Items.lava_bucket), + firecharge, + blazerod, + firecharge, + blazerod); + MantleClientRegistry.registerManualLargeRecipe( + "silkycloth", + silkyCloth, + string, + string, + string, + string, + new ItemStack(TinkerTools.materials, 1, 24), + string, + string, + string, + string); + MantleClientRegistry.registerManualLargeRecipe( + "silkyjewel", + new ItemStack(TinkerTools.materials, 1, 26), + null, + silkyCloth, + null, + silkyCloth, + new ItemStack(Items.emerald), + silkyCloth, + null, + silkyCloth, + null); // Modifier recipes - ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.binding, 1, 6), ""); + ItemStack ironpick = ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.pickaxeHead, 1, 6), + new ItemStack(TinkerTools.toolRod, 1, 2), + new ItemStack(TinkerTools.binding, 1, 6), + ""); MantleClientRegistry.registerManualIcon("ironpick", ironpick); - ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.handGuard, 1, 10), ""); + ItemStack ironlongsword = ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.swordBlade, 1, 6), + new ItemStack(TinkerTools.toolRod, 1, 2), + new ItemStack(TinkerTools.handGuard, 1, 10), + ""); MantleClientRegistry.registerManualIcon("ironlongsword", ironlongsword); TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Items.diamond)); TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Items.emerald)); - TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Items.redstone), new ItemStack(Blocks.redstone_block)); - TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 7)); - TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Items.dye, 1, 4), new ItemStack(Blocks.lapis_block)); - TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 6)); - TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block)); - TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder)); - TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TinkerTools.materials, 1, 8)); - TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26)); - TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6)); - - TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston)); - TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Items.ender_pearl), new ItemStack(Blocks.obsidian)); - TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye)); - TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TinkerTools.craftedSoil, 1, 4)); + TConstructClientRegistry.registerManualModifier( + "redstonemod", ironpick.copy(), new ItemStack(Items.redstone), new ItemStack(Blocks.redstone_block)); + TConstructClientRegistry.registerManualModifier( + "lavacrystalmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 7)); + TConstructClientRegistry.registerManualModifier( + "lapismod", ironpick.copy(), new ItemStack(Items.dye, 1, 4), new ItemStack(Blocks.lapis_block)); + TConstructClientRegistry.registerManualModifier( + "mossmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 6)); + TConstructClientRegistry.registerManualModifier( + "quartzmod", ironlongsword.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block)); + TConstructClientRegistry.registerManualModifier( + "blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder)); + TConstructClientRegistry.registerManualModifier( + "necroticmod", ironlongsword.copy(), new ItemStack(TinkerTools.materials, 1, 8)); + TConstructClientRegistry.registerManualModifier( + "silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26)); + TConstructClientRegistry.registerManualModifier( + "reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6)); + + TConstructClientRegistry.registerManualModifier( + "pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston)); + TConstructClientRegistry.registerManualModifier( + "beheadingmod", ironlongsword.copy(), new ItemStack(Items.ender_pearl), new ItemStack(Blocks.obsidian)); + TConstructClientRegistry.registerManualModifier( + "spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye)); + TConstructClientRegistry.registerManualModifier( + "smitemod", ironlongsword.copy(), new ItemStack(TinkerTools.craftedSoil, 1, 4)); TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Blocks.dirt)); TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Blocks.dirt)); - TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block)); - TConstructClientRegistry.registerManualModifier("tier1.5free", ironpick.copy(), new ItemStack(Items.golden_apple, 1, 1), new ItemStack(Blocks.diamond_block)); + TConstructClientRegistry.registerManualModifier( + "tier1free", ironpick.copy(), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block)); + TConstructClientRegistry.registerManualModifier( + "tier1.5free", + ironpick.copy(), + new ItemStack(Items.golden_apple, 1, 1), + new ItemStack(Blocks.diamond_block)); TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Items.nether_star)); - TConstructClientRegistry.registerManualModifier("creativefree", ironpick.copy(), new ItemStack(TinkerTools.creativeModifier)); - - TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TinkerSmeltery.speedBlock), new ItemStack(TinkerSmeltery.moltenTin, 1), new ItemStack(Blocks.gravel)); - TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TinkerSmeltery.clearGlass), new ItemStack(TinkerSmeltery.moltenGlass, 1), null); - TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TinkerSmeltery.smeltery, 1, 4), new ItemStack(TinkerSmeltery.moltenStone, 1), null); - TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Blocks.end_stone), new ItemStack(TinkerSmeltery.moltenEnder, 1), new ItemStack(Blocks.obsidian)); - TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TinkerTools.materials, 1, 36), new ItemStack(TinkerSmeltery.glueFluidBlock, 1), null); + TConstructClientRegistry.registerManualModifier( + "creativefree", ironpick.copy(), new ItemStack(TinkerTools.creativeModifier)); + + TConstructClientRegistry.registerManualSmeltery( + "brownstone", + new ItemStack(TinkerSmeltery.speedBlock), + new ItemStack(TinkerSmeltery.moltenTin, 1), + new ItemStack(Blocks.gravel)); + TConstructClientRegistry.registerManualSmeltery( + "clearglass", + new ItemStack(TinkerSmeltery.clearGlass), + new ItemStack(TinkerSmeltery.moltenGlass, 1), + null); + TConstructClientRegistry.registerManualSmeltery( + "searedstone", + new ItemStack(TinkerSmeltery.smeltery, 1, 4), + new ItemStack(TinkerSmeltery.moltenStone, 1), + null); + TConstructClientRegistry.registerManualSmeltery( + "endstone", + new ItemStack(Blocks.end_stone), + new ItemStack(TinkerSmeltery.moltenEnder, 1), + new ItemStack(Blocks.obsidian)); + TConstructClientRegistry.registerManualSmeltery( + "glueball", + new ItemStack(TinkerTools.materials, 1, 36), + new ItemStack(TinkerSmeltery.glueFluidBlock, 1), + null); } @Override - protected void registerGuiHandler () - { + protected void registerGuiHandler() { super.registerGuiHandler(); TProxyCommon.registerClientGuiHandler(toolStationID, this); TProxyCommon.registerClientGuiHandler(partBuilderID, this); @@ -267,25 +511,29 @@ protected void registerGuiHandler () } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { if (ID == ToolProxyCommon.toolStationID) - return new ToolStationGui(player.inventory, (ToolStationLogic) world.getTileEntity(x, y, z), world, x, y, z); + return new ToolStationGui( + player.inventory, (ToolStationLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.partBuilderID) - return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.getTileEntity(x, y, z), world, x, y, z); + return new PartCrafterGui( + player.inventory, (PartBuilderLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.patternChestID) - return new PatternChestGui(player.inventory, (PatternChestLogic) world.getTileEntity(x, y, z), world, x, y, z); + return new PatternChestGui( + player.inventory, (PatternChestLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.frypanGuiID) return new FrypanGui(player.inventory, (FrypanLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.battlesignTextID) return new BattlesignGui((BattlesignLogic) world.getTileEntity(x, y, z)); if (ID == ToolProxyCommon.stencilTableID) - return new StencilTableGui(player.inventory, (StencilTableLogic) world.getTileEntity(x, y, z), world, x, y, z); + return new StencilTableGui( + player.inventory, (StencilTableLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.toolForgeID) return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.craftingStationID) - return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getTileEntity(x, y, z), world, x, y, z); + return new CraftingStationGui( + player.inventory, (CraftingStationLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == ToolProxyCommon.furnaceID) return new FurnaceGui(player.inventory, (FurnaceLogic) world.getTileEntity(x, y, z)); @@ -294,10 +542,8 @@ public Object getClientGuiElement (int ID, EntityPlayer player, World world, int } @SubscribeEvent - public void onSound (SoundLoadEvent event) - { - try - { + public void onSound(SoundLoadEvent event) { + try { /* * SoundManager soundmanager = event.manager; * soundmanager.addSound("tinker:frypan_hit.ogg"); @@ -305,163 +551,220 @@ public void onSound (SoundLoadEvent event) * soundmanager.addSound("tinker:launcher_clank.ogg"); * TConstruct.logger.info("Successfully loaded sounds."); */ - } - catch (Exception e) - { + } catch (Exception e) { TConstruct.logger.error("Failed to register one or more sounds"); } MinecraftForge.EVENT_BUS.unregister(this); } - void addStencilButtons () - { - int[][] icons = { { 0, 3 }, // tool rod - { 1, 3 }, // binding - { 8, 3 }, // large tool rod - { 9, 3 }, // large binding - - { 0, 2 }, // pickaxe head - { 3, 2 }, // shovel head - { 2, 2 }, // hatchet head - { 8, 2 }, // scythe - - { 11, 2 }, // hammer head - { 10, 2 }, // excavator head - { 6, 2 }, // lumberaxe head - { 9, 2 }, // large plate - - {}, { 4, 2 }, // frying pan - { 5, 2 }, // battlesign - { 7, 3 }, // chisel - - {}, { 7, 2 }, // knifeblade - { 1, 2 }, // swordblade - { 6, 3 }, // cleaver blade - - {}, { 4, 3 }, // crossbar - { 3, 3 }, // small guard - { 2, 3 }, // wide guard + void addStencilButtons() { + int[][] icons = { + {0, 3}, // tool rod + {1, 3}, // binding + {8, 3}, // large tool rod + {9, 3}, // large binding + {0, 2}, // pickaxe head + {3, 2}, // shovel head + {2, 2}, // hatchet head + {8, 2}, // scythe + {11, 2}, // hammer head + {10, 2}, // excavator head + {6, 2}, // lumberaxe head + {9, 2}, // large plate + {}, {4, 2}, // frying pan + {5, 2}, // battlesign + {7, 3}, // chisel + {}, {7, 2}, // knifeblade + {1, 2}, // swordblade + {6, 3}, // cleaver blade + {}, {4, 3}, // crossbar + {3, 3}, // small guard + {2, 3}, // wide guard }; int i = 0; - for (int[] icon : icons) - { + for (int[] icon : icons) { // spacer - if(icon.length == 0) - { + if (icon.length == 0) { addStencilButton(0, 0, -1); - } - else - addStencilButton(icon[0], icon[1], i++); + } else addStencilButton(icon[0], icon[1], i++); } } - void addStencilButton (int xButton, int yButton, int index) - { + void addStencilButton(int xButton, int yButton, int index) { TConstructClientRegistry.addStencilButton(xButton, yButton, index, "tinker", "textures/gui/icons.png"); } static int[][] itemIconsT1 = { - new int[] { 1, 4, 0 }, // Pickaxe - new int[] { 2, 5, 0 }, // Shovel - new int[] { 2, 6, 0 }, // Hatchet - new int[] { 3, 8, 0 }, // Mattock - new int[] { 1, 0, 1 }, // Broadsword - new int[] { 1, 1, 1 }, // Longsword - new int[] { 1, 2, 1 }, // Rapier - new int[] { 1, 5, 1 }, // Dagger - new int[] { 2, 3, 1 }, // Frying pan - new int[] { 2, 4, 1 }, // Battlesign - new int[] { 2, 6, 1 } // Chisel + new int[] {1, 4, 0}, // Pickaxe + new int[] {2, 5, 0}, // Shovel + new int[] {2, 6, 0}, // Hatchet + new int[] {3, 8, 0}, // Mattock + new int[] {1, 0, 1}, // Broadsword + new int[] {1, 1, 1}, // Longsword + new int[] {1, 2, 1}, // Rapier + new int[] {1, 5, 1}, // Dagger + new int[] {2, 3, 1}, // Frying pan + new int[] {2, 4, 1}, // Battlesign + new int[] {2, 6, 1} // Chisel }; static int[][] iconCoordsT1 = { - new int[] { 0, 0, 1, 13 }, new int[] { 2, 3, 3, 13 }, // Pickaxe - new int[] { 3, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Shovel - new int[] { 2, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Hatchet - new int[] { 2, 0, 3, 13 }, new int[] { 2, 3, 2, 13 }, // Mattock - new int[] { 1, 0, 2, 13 }, new int[] { 2, 3, 3, 13 }, // Broadsword - new int[] { 1, 0, 3, 13 }, new int[] { 2, 3, 3, 13 }, // Longsword - new int[] { 1, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Rapier - new int[] { 7, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Dagger - new int[] { 4, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Frying Pan - new int[] { 5, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Battlesign - new int[] { 7, 0, 13, 13 }, new int[] { 3, 3, 13, 13 } // Chisel + new int[] {0, 0, 1, 13}, new int[] {2, 3, 3, 13}, // Pickaxe + new int[] {3, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Shovel + new int[] {2, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Hatchet + new int[] {2, 0, 3, 13}, new int[] {2, 3, 2, 13}, // Mattock + new int[] {1, 0, 2, 13}, new int[] {2, 3, 3, 13}, // Broadsword + new int[] {1, 0, 3, 13}, new int[] {2, 3, 3, 13}, // Longsword + new int[] {1, 0, 4, 13}, new int[] {2, 3, 3, 13}, // Rapier + new int[] {7, 0, 4, 13}, new int[] {2, 3, 3, 13}, // Dagger + new int[] {4, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Frying Pan + new int[] {5, 0, 13, 13}, new int[] {2, 3, 13, 13}, // Battlesign + new int[] {7, 0, 13, 13}, new int[] {3, 3, 13, 13} // Chisel }; static int[][] itemIconsT2 = { - new int[] { 6, 13, 0, }, // Hammer - new int[] { 5, 11, 0, }, // Lumberaxe - new int[] { 5, 12, 0, }, // Excavator - new int[] { 4, 10, 0, }, // Scythe - new int[] { 5, 7, 1, }, // Cleaver - new int[] { 5, 8, 1, }, // Battleaxe + new int[] { + 6, 13, 0, + }, // Hammer + new int[] { + 5, 11, 0, + }, // Lumberaxe + new int[] { + 5, 12, 0, + }, // Excavator + new int[] { + 4, 10, 0, + }, // Scythe + new int[] { + 5, 7, 1, + }, // Cleaver + new int[] { + 5, 8, 1, + }, // Battleaxe }; static int[][] iconCoordsT2 = { - new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, // Hammer - new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, // Lumberaxe - new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, // Excavator - new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, // Scythe - new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, // Cleaver - new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, // Battleaxe + new int[] {11, 8, 9, 9}, new int[] {2, 3, 2, 2}, // Hammer + new int[] {6, 8, 9, 9}, new int[] {2, 3, 2, 3}, // Lumberaxe + new int[] {10, 8, 9, 9}, new int[] {2, 3, 2, 3}, // Excavator + new int[] {8, 8, 9, 8}, new int[] {2, 3, 3, 3}, // Scythe + new int[] {6, 8, 9, 8}, new int[] {3, 3, 2, 3}, // Cleaver + new int[] {6, 8, 6, 9}, new int[] {2, 3, 2, 3}, // Battleaxe }; - void addToolButtons () - { - final ToolCore[] tier1Tools = {pickaxe, shovel, hatchet, mattock, broadsword, longsword, rapier, dagger, frypan, battlesign, chisel}; + void addToolButtons() { + final ToolCore[] tier1Tools = { + pickaxe, shovel, hatchet, mattock, broadsword, longsword, rapier, dagger, frypan, battlesign, chisel + }; final ToolCore[] tier2Tools = {hammer, lumberaxe, excavator, scythe, cleaver, battleaxe}; // repair - addToolButton(0, 3, 0, new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, StatCollector.translateToLocal("gui.toolforge1"), "gui.toolforge2"); + addToolButton( + 0, + 3, + 0, + new int[] {0, 1, 2, 13}, + new int[] {13, 13, 13, 13}, + StatCollector.translateToLocal("gui.toolforge1"), + "gui.toolforge2"); // tier 1 tools - for (int i = 0; i < tier1Tools.length; i++) - { - String locString = String.format("gui.toolstation.%s.desc", tier1Tools[i].getToolName().toLowerCase()); - addToolButton(itemIconsT1[i][0], itemIconsT1[i][1], itemIconsT1[i][2], iconCoordsT1[i * 2], iconCoordsT1[i * 2 + 1], tier1Tools[i].getLocalizedToolName(), locString); + for (int i = 0; i < tier1Tools.length; i++) { + String locString = String.format( + "gui.toolstation.%s.desc", tier1Tools[i].getToolName().toLowerCase()); + addToolButton( + itemIconsT1[i][0], + itemIconsT1[i][1], + itemIconsT1[i][2], + iconCoordsT1[i * 2], + iconCoordsT1[i * 2 + 1], + tier1Tools[i].getLocalizedToolName(), + locString); } // tier 2 tools - for (int i = 0; i < tier2Tools.length; i++) - { - String locString = String.format("gui.toolstation.%s.desc", tier2Tools[i].getToolName().toLowerCase()); - addTierTwoButton(itemIconsT2[i][0], itemIconsT2[i][1], itemIconsT2[i][2], iconCoordsT2[i * 2], iconCoordsT2[i * 2 + 1], tier2Tools[i].getLocalizedToolName(), locString); + for (int i = 0; i < tier2Tools.length; i++) { + String locString = String.format( + "gui.toolstation.%s.desc", tier2Tools[i].getToolName().toLowerCase()); + addTierTwoButton( + itemIconsT2[i][0], + itemIconsT2[i][1], + itemIconsT2[i][2], + iconCoordsT2[i * 2], + iconCoordsT2[i * 2 + 1], + tier2Tools[i].getLocalizedToolName(), + locString); } } - void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) - { - TConstructClientRegistry.addToolButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); + void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) { + TConstructClientRegistry.addToolButton(new ToolGuiElement( + slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); } - void addTierTwoButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) - { - TConstructClientRegistry.addTierTwoButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); + void addTierTwoButton( + int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) { + TConstructClientRegistry.addTierTwoButton(new ToolGuiElement( + slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); } - void addToolRenderMappings () - { - String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", "pigiron" }; - String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", "reinforced", "flux" }; - int[] universalEffects = { 0, 1, 4, 9, 16 }; - int[] weaponEffects = { 3, 5, 7, 13, 14, 15 }; - int[] harvestEffects = { 2 }; - int[] nonUtility = { 6, 8, 10, 11, 12 }; - - for (int partIter = 0; partIter < partTypes.length; partIter++) - { + void addToolRenderMappings() { + String[] partTypes = { + "wood", + "stone", + "iron", + "flint", + "cactus", + "bone", + "obsidian", + "netherrack", + "slime", + "paper", + "cobalt", + "ardite", + "manyullyn", + "copper", + "bronze", + "alumite", + "steel", + "blueslime", + "pigiron" + }; + String[] effectTypes = { + "diamond", + "emerald", + "redstone", + "piston", + "moss", + "ice", + "lava", + "blaze", + "necrotic", + "flux", + "lapis", + "quartz", + "silk", + "beheading", + "smite", + "spider", + "reinforced", + "flux" + }; + int[] universalEffects = {0, 1, 4, 9, 16}; + int[] weaponEffects = {3, 5, 7, 13, 14, 15}; + int[] harvestEffects = {2}; + int[] nonUtility = {6, 8, 10, 11, 12}; + + for (int partIter = 0; partIter < partTypes.length; partIter++) { TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true); } - for (ToolCore tool : TConstructRegistry.getToolMapping()) - { - for (int i = 0; i < effectTypes.length; i++) - { + for (ToolCore tool : TConstructRegistry.getToolMapping()) { + for (int i = 0; i < effectTypes.length; i++) { TConstructClientRegistry.addEffectRenderMapping(tool, i, "tinker", effectTypes[i], true); } } - } } diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java index 76fad92ef21..91c16b98244 100644 --- a/src/main/java/tconstruct/tools/ToolProxyCommon.java +++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java @@ -7,8 +7,7 @@ import net.minecraft.world.World; import tconstruct.common.TProxyCommon; -public class ToolProxyCommon implements IGuiHandler -{ +public class ToolProxyCommon implements IGuiHandler { public static final int toolStationID = 0; public static final int partBuilderID = 1; public static final int patternChestID = 2; @@ -19,17 +18,13 @@ public class ToolProxyCommon implements IGuiHandler public static final int craftingStationID = 11; public static final int battlesignTextID = 12; - public ToolProxyCommon() - { - } + public ToolProxyCommon() {} - public void initialize () - { + public void initialize() { registerGuiHandler(); } - protected void registerGuiHandler () - { + protected void registerGuiHandler() { TProxyCommon.registerServerGuiHandler(toolStationID, this); TProxyCommon.registerServerGuiHandler(partBuilderID, this); TProxyCommon.registerServerGuiHandler(patternChestID, this); @@ -41,19 +36,16 @@ protected void registerGuiHandler () } @Override - public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof InventoryLogic) - { + if (tile != null && tile instanceof InventoryLogic) { return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); } return null; } @Override - public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) - { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { return null; } } diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index f14514552f6..25e61fc5153 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -12,84 +12,102 @@ import tconstruct.tools.logic.BattlesignLogic; import tconstruct.tools.model.BattlesignRender; -public class BattlesignBlock extends EquipBlock -{ +public class BattlesignBlock extends EquipBlock { - public BattlesignBlock(Material material) - { + public BattlesignBlock(Material material) { super(material); this.setBlockBounds(0.45F, 0F, 0.45F, 0.55F, 1.125F, 0.55F); } @Override - public int getRenderType () - { + public int getRenderType() { return BattlesignRender.battlesignModelID; } @SideOnly(Side.CLIENT) @Override - public boolean shouldSideBeRendered (IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) - { - return p_149646_5_ == 0 && this.minY > 0.0D ? true : (p_149646_5_ == 1 && this.maxY < 1.0D ? true : (p_149646_5_ == 2 && this.minZ > 0.0D ? true : (p_149646_5_ == 3 && this.maxZ < 1.0D ? true : (p_149646_5_ == 4 && this.minX > 0.0D ? true : (p_149646_5_ == 5 && this.maxX < 1.0D ? true : !(p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_).isOpaqueCube() && p_149646_1_.getBlock(p_149646_2_, p_149646_3_ + 1, p_149646_4_).isOpaqueCube())))))); + public boolean shouldSideBeRendered( + IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { + return p_149646_5_ == 0 && this.minY > 0.0D + ? true + : (p_149646_5_ == 1 && this.maxY < 1.0D + ? true + : (p_149646_5_ == 2 && this.minZ > 0.0D + ? true + : (p_149646_5_ == 3 && this.maxZ < 1.0D + ? true + : (p_149646_5_ == 4 && this.minX > 0.0D + ? true + : (p_149646_5_ == 5 && this.maxX < 1.0D + ? true + : !(p_149646_1_ + .getBlock(p_149646_2_, p_149646_3_, p_149646_4_) + .isOpaqueCube() + && p_149646_1_ + .getBlock( + p_149646_2_, + p_149646_3_ + 1, + p_149646_4_) + .isOpaqueCube())))))); } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { + public TileEntity createNewTileEntity(World world, int metadata) { return new BattlesignLogic(); } @Override - public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) - { + public void onBlockPlacedBy( + World par1World, + int par2, + int par3, + int par4, + EntityLivingBase par5EntityLivingBase, + ItemStack par6ItemStack) { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int newMeta = 0; - switch (i3) - { - case 3: - newMeta = 0; - break; - case 0: - newMeta = 3; - break; - case 1: - newMeta = 1; - break; - case 2: - newMeta = 2; - break; + switch (i3) { + case 3: + newMeta = 0; + break; + case 0: + newMeta = 3; + break; + case 1: + newMeta = 1; + break; + case 2: + newMeta = 2; + break; } par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); } @Override - public void setBlockBoundsBasedOnState (IBlockAccess blockAccess, int x, int y, int z) - { - switch (blockAccess.getBlockMetadata(x, y, z)) - { - case 0: - setBlockBounds(0.42F, 0.5F, 0F, 0.50F, 1.1F, 1F); - break; - case 1: - setBlockBounds(0.50F, 0.5F, 0F, 0.58F, 1.1F, 1F); - break; - case 2: - setBlockBounds(0F, 0.5F, 0.50F, 1F, 1.1F, 0.58F); - break; - case 3: - setBlockBounds(0F, 0.5F, 0.42F, 1F, 1.1F, 0.50F); - break; + public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int x, int y, int z) { + switch (blockAccess.getBlockMetadata(x, y, z)) { + case 0: + setBlockBounds(0.42F, 0.5F, 0F, 0.50F, 1.1F, 1F); + break; + case 1: + setBlockBounds(0.50F, 0.5F, 0F, 0.58F, 1.1F, 1F); + break; + case 2: + setBlockBounds(0F, 0.5F, 0.50F, 1F, 1.1F, 0.58F); + break; + case 3: + setBlockBounds(0F, 0.5F, 0.42F, 1F, 1.1F, 0.50F); + break; } } @Override - public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) - { + public void addCollisionBoxesToList( + World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); @@ -100,15 +118,12 @@ public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlign } @Override - public TileEntity createTileEntity (World world, int metadata) - { + public TileEntity createTileEntity(World world, int metadata) { return new BattlesignLogic(); } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return null; } - } diff --git a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java index 59dc3d59651..850a1a5197c 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -20,10 +20,8 @@ import tconstruct.tools.logic.*; import tconstruct.util.config.PHConstruct; -public class CraftingSlab extends InventorySlab -{ - public CraftingSlab(Material material) - { +public class CraftingSlab extends InventorySlab { + public CraftingSlab(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(2f); @@ -32,115 +30,129 @@ public CraftingSlab(Material material) /* Rendering */ @Override - public String[] getTextureNames () - { - String[] textureNames = { "craftingstation_top", "craftingstation_slab_side", "craftingstation_bottom", "toolstation_top", "toolstation_slab_side", "toolstation_bottom", "partbuilder_oak_top", "partbuilder_slab_side", "partbuilder_oak_bottom", "stenciltable_oak_top", "stenciltable_slab_side", "stenciltable_oak_bottom", "patternchest_top", "patternchest_slab_side", "patternchest_bottom", "toolforge_top", "toolforge_slab_side", "toolforge_top" }; + public String[] getTextureNames() { + String[] textureNames = { + "craftingstation_top", + "craftingstation_slab_side", + "craftingstation_bottom", + "toolstation_top", + "toolstation_slab_side", + "toolstation_bottom", + "partbuilder_oak_top", + "partbuilder_slab_side", + "partbuilder_oak_bottom", + "stenciltable_oak_top", + "stenciltable_slab_side", + "stenciltable_oak_bottom", + "patternchest_top", + "patternchest_slab_side", + "patternchest_bottom", + "toolforge_top", + "toolforge_slab_side", + "toolforge_top" + }; return textureNames; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; } - public int getTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); - return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); + return AxisAlignedBB.getBoundingBox( + (double) x + this.minX, + (double) y + this.minY, + (double) z + this.minZ, + (double) x + this.maxX, + (double) y + this.maxY - 0.125, + (double) z + this.maxZ); + return AxisAlignedBB.getBoundingBox( + (double) x + this.minX, + (double) y + this.minY, + (double) z + this.minZ, + (double) x + this.maxX, + (double) y + this.maxY, + (double) z + this.maxZ); } @Override - public TileEntity createTileEntity (World world, int metadata) - { - switch (metadata % 8) - { - case 0: - return new CraftingStationLogic(); - case 1: - return new ToolStationLogic(); - case 2: - return new PartBuilderLogic(); - case 3: - return new StencilTableLogic(); - case 4: - return new PatternChestLogic(); - case 5: - return new ToolForgeLogic(); - default: - return null; + public TileEntity createTileEntity(World world, int metadata) { + switch (metadata % 8) { + case 0: + return new CraftingStationLogic(); + case 1: + return new ToolStationLogic(); + case 2: + return new PartBuilderLogic(); + case 3: + return new StencilTableLogic(); + case 4: + return new PatternChestLogic(); + case 5: + return new ToolForgeLogic(); + default: + return null; } } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { int meta = world.getBlockMetadata(x, y, z) % 8; - switch (meta) - { - case 0: - return ToolProxyCommon.craftingStationID; - case 1: - return ToolProxyCommon.toolStationID; - case 2: - return ToolProxyCommon.partBuilderID; - case 3: - return ToolProxyCommon.stencilTableID; - case 4: - return ToolProxyCommon.patternChestID; - case 5: - return ToolProxyCommon.toolForgeID; + switch (meta) { + case 0: + return ToolProxyCommon.craftingStationID; + case 1: + return ToolProxyCommon.toolStationID; + case 2: + return ToolProxyCommon.partBuilderID; + case 3: + return ToolProxyCommon.stencilTableID; + case 4: + return ToolProxyCommon.patternChestID; + case 5: + return ToolProxyCommon.toolForgeID; } return -1; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 6; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < 6; iter++) { list.add(new ItemStack(b, 1, iter)); } } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) - { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { boolean keptInventory = false; - if (stack.hasTagCompound()) - { + if (stack.hasTagCompound()) { NBTTagCompound inventory = stack.getTagCompound().getCompoundTag("Inventory"); TileEntity te = world.getTileEntity(x, y, z); - if (inventory != null && te instanceof PatternChestLogic) - { + if (inventory != null && te instanceof PatternChestLogic) { PatternChestLogic logic = (PatternChestLogic) te; logic.readInventoryFromNBT(inventory); logic.xCoord = x; @@ -149,14 +161,11 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase keptInventory = true; } } - if (!keptInventory && PHConstruct.freePatterns) - { + if (!keptInventory && PHConstruct.freePatterns) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 4) - { + if (meta == 4) { PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); - for (int i = 1; i <= 13; i++) - { + for (int i = 1; i <= 13; i++) { logic.setInventorySlotContents(i - 1, new ItemStack(TinkerTools.woodPattern, 1, i)); } logic.setInventorySlotContents(13, new ItemStack(TinkerTools.woodPattern, 1, 22)); @@ -166,38 +175,33 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase } @Override - public TileEntity createNewTileEntity (World var1, int metadata) - { - switch (metadata % 8) - { - case 0: - return new CraftingStationLogic(); - case 1: - return new ToolStationLogic(); - case 2: - return new PartBuilderLogic(); - case 3: - return new StencilTableLogic(); - case 4: - return new PatternChestLogic(); - case 5: - return new ToolForgeLogic(); - default: - return null; + public TileEntity createNewTileEntity(World var1, int metadata) { + switch (metadata % 8) { + case 0: + return new CraftingStationLogic(); + case 1: + return new ToolStationLogic(); + case 2: + return new PartBuilderLogic(); + case 3: + return new StencilTableLogic(); + case 4: + return new PatternChestLogic(); + case 5: + return new ToolForgeLogic(); + default: + return null; } } /* Keep pattern chest inventory */ @Override - public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) - { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { player.addExhaustion(0.025F); - if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) - { + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 4) - { + if (meta == 4) { ItemStack chest = new ItemStack(this, 1, 4); NBTTagCompound inventory = new NBTTagCompound(); PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); @@ -208,17 +212,16 @@ public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, // remove content. This is necessary because otherwise the patterns would also spill into the world // we don't want to prevent that since that's the intended behaviour for explosions. - for(int i = 0; i < logic.getSizeInventory(); i++) - logic.setInventorySlotContents(i, null); + for (int i = 0; i < logic.getSizeInventory(); i++) logic.setInventorySlotContents(i, null); - //Spawn item - if (!player.capabilities.isCreativeMode || player.isSneaking()) - { + // Spawn item + if (!player.capabilities.isCreativeMode || player.isSneaking()) { float f = 0.7F; double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, chest); + EntityItem entityitem = + new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, chest); entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); } @@ -228,10 +231,8 @@ public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, } @Override - public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) - { - if (meta != 4) - super.harvestBlock(world, player, x, y, z, meta); - //Do nothing + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { + if (meta != 4) super.harvestBlock(world, player, x, y, z, meta); + // Do nothing } } diff --git a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index a50b5e4af19..bda33396299 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -17,98 +17,81 @@ import tconstruct.tools.logic.CraftingStationLogic; import tconstruct.tools.model.TableRender; -public class CraftingStationBlock extends InventoryBlock -{ - public CraftingStationBlock(Material material) - { +public class CraftingStationBlock extends InventoryBlock { + public CraftingStationBlock(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(2f); this.setStepSound(Block.soundTypeWood); } - //Block.hasComparatorInputOverride and Block.getComparatorInputOverride + // Block.hasComparatorInputOverride and Block.getComparatorInputOverride /* Rendering */ @Override - public String[] getTextureNames () - { - String[] textureNames = { "craftingstation_top", "craftingstation_side", "craftingstation_bottom" }; + public String[] getTextureNames() { + String[] textureNames = {"craftingstation_top", "craftingstation_side", "craftingstation_bottom"}; return textureNames; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return icons[getTextureIndex(side)]; } - public int getTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderType () - { + public int getRenderType() { return TableRender.model; } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return ToolProxyCommon.craftingStationID; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 1; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 1; iter++) { list.add(new ItemStack(id, 1, iter)); } } @Override - public TileEntity createNewTileEntity (World arg0, int arg1) - { + public TileEntity createNewTileEntity(World arg0, int arg1) { return new CraftingStationLogic(); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index 6e522b821ac..48cf5e7d4d0 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -21,11 +21,9 @@ import tconstruct.tools.logic.*; import tconstruct.tools.model.FrypanRender; -public class EquipBlock extends InventoryBlock -{ +public class EquipBlock extends InventoryBlock { - public EquipBlock(Material material) - { + public EquipBlock(Material material) { super(material); this.setHardness(0.3f); this.setBlockBounds(0, 0, 0, 1, 0.25f, 1); @@ -33,67 +31,56 @@ public EquipBlock(Material material) } @Override - public String[] getTextureNames () - { - return new String[] { "toolstation_top" }; + public String[] getTextureNames() { + return new String[] {"toolstation_top"}; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return Blocks.iron_block.getIcon(side, meta); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister par1IconRegister) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { // this.blockIcon = // par1iconRegister.registerIcon(Block.blockIron.getUnlocalizedName()); } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderType () - { + public int getRenderType() { return FrypanRender.frypanModelID; } @Override - public Item getItemDropped (int par1, Random par2Random, int par3) - { + public Item getItemDropped(int par1, Random par2Random, int par3) { return null; } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { + public TileEntity createNewTileEntity(World world, int metadata) { return new FrypanLogic(); } @Override - public void randomDisplayTick (World world, int x, int y, int z, Random random) - { - if (isActive(world, x, y, z)) - { + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + if (isActive(world, x, y, z)) { float f = (float) x + 0.5F; float f1 = (float) y + 0.25F + (random.nextFloat() * 6F) / 16F; float f2 = (float) z + 0.5F; @@ -104,64 +91,67 @@ public void randomDisplayTick (World world, int x, int y, int z, Random random) } @Override - public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) - { + public void onBlockPlacedBy( + World par1World, + int par2, + int par3, + int par4, + EntityLivingBase par5EntityLivingBase, + ItemStack par6ItemStack) { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int newMeta = 0; - switch (i3) - { - case 3: - newMeta = 0; - break; - case 0: - newMeta = 3; - break; - case 1: - newMeta = 1; - break; - case 2: - newMeta = 2; - break; + switch (i3) { + case 3: + newMeta = 0; + break; + case 0: + newMeta = 3; + break; + case 1: + newMeta = 1; + break; + case 2: + newMeta = 2; + break; } par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); } @Override - public void breakBlock (World par1World, int x, int y, int z, Block par5, int meta) - { + public void breakBlock(World par1World, int x, int y, int z, Block par5, int meta) { TileEntity te = par1World.getTileEntity(x, y, z); - if (te != null && te instanceof EquipLogic) - { + if (te != null && te instanceof EquipLogic) { EquipLogic logic = (EquipLogic) te; - for (int iter = 0; iter < logic.getSizeInventory(); ++iter) - { + for (int iter = 0; iter < logic.getSizeInventory(); ++iter) { ItemStack stack = iter == 0 ? logic.getEquipmentItem() : logic.getStackInSlot(iter); - if (stack != null && logic.canDropInventorySlot(iter)) - { + if (stack != null && logic.canDropInventorySlot(iter)) { float jumpX = rand.nextFloat() * 0.8F + 0.1F; float jumpY = rand.nextFloat() * 0.8F + 0.1F; float jumpZ = rand.nextFloat() * 0.8F + 0.1F; - while (stack.stackSize > 0) - { + while (stack.stackSize > 0) { int itemSize = rand.nextInt(21) + 10; - if (itemSize > stack.stackSize) - { + if (itemSize > stack.stackSize) { itemSize = stack.stackSize; } stack.stackSize -= itemSize; - EntityItem entityitem = new EntityItem(par1World, (double) ((float) x + jumpX), (double) ((float) y + jumpY), (double) ((float) z + jumpZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); - - if (stack.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + EntityItem entityitem = new EntityItem( + par1World, + (double) ((float) x + jumpX), + (double) ((float) y + jumpY), + (double) ((float) z + jumpZ), + new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); + + if (stack.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) + stack.getTagCompound().copy()); } float offset = 0.05F; @@ -178,39 +168,34 @@ public void breakBlock (World par1World, int x, int y, int z, Block par5, int me } @Override - public int getLightValue (IBlockAccess world, int x, int y, int z) - { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return !isActive(world, x, y, z) ? 0 : 9; } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return ToolProxyCommon.frypanGuiID; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override @SideOnly(Side.CLIENT) - public int colorMultiplier (IBlockAccess blockAccess, int x, int y, int z) - { + public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { TileEntity te = blockAccess.getTileEntity(x, y, z); - if (te instanceof EquipLogic) - { + if (te instanceof EquipLogic) { EquipLogic logic = (EquipLogic) te; ItemStack stack = logic.getEquipmentItem(); - if (stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey("InfiTool")) - { + if (stack != null + && stack.hasTagCompound() + && stack.getTagCompound().hasKey("InfiTool")) { NBTTagCompound tag = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tag != null) - { + if (tag != null) { int head = tag.getInteger("Head"); return TConstructRegistry.getMaterial(head).primaryColor(); @@ -222,9 +207,7 @@ public int colorMultiplier (IBlockAccess blockAccess, int x, int y, int z) } @Override - public TileEntity createTileEntity (World world, int metadata) - { + public TileEntity createTileEntity(World world, int metadata) { return new FrypanLogic(); } - } diff --git a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java index 925e45e5d45..3d31c13e4a8 100644 --- a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java @@ -15,73 +15,58 @@ import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.FurnaceLogic; -public class FurnaceSlab extends InventorySlab -{ +public class FurnaceSlab extends InventorySlab { - public FurnaceSlab(Material material) - { + public FurnaceSlab(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(3.5f); } @Override - public TileEntity createTileEntity (World world, int metadata) - { - switch (metadata % 8) - { - case 0: - return new FurnaceLogic(); + public TileEntity createTileEntity(World world, int metadata) { + switch (metadata % 8) { + case 0: + return new FurnaceLogic(); } return null; } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return ToolProxyCommon.furnaceID; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public String[] getTextureNames () - { - String[] textureNames = { "furnaceslab_front", "furnaceslab_front_active", "furnaceslab_side", "furnace_top" }; + public String[] getTextureNames() { + String[] textureNames = {"furnaceslab_front", "furnaceslab_front_active", "furnaceslab_side", "furnace_top"}; return textureNames; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) - { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z) % 8; - if (meta == 0) - { - if (side == direction) - { - if (((IActiveLogic) logic).getActive()) - return icons[1]; - else - return icons[0]; - } - else if (side > 1) - { + if (meta == 0) { + if (side == direction) { + if (((IActiveLogic) logic).getActive()) return icons[1]; + else return icons[0]; + } else if (side > 1) { return icons[2]; } return icons[3]; @@ -89,87 +74,66 @@ else if (side > 1) return icons[0]; } - public int getTextureIndex (int side) - { - if (side == 0 || side == 1) - return 3; - if (side == 3) - return 0; + public int getTextureIndex(int side) { + if (side == 0 || side == 1) return 3; + if (side == 3) return 0; return 2; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { String[] textureNames = getTextureNames(); this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { - if (i == 3) - this.icons[i] = iconRegister.registerIcon("minecraft:" + textureNames[i]); - else - this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); + for (int i = 0; i < this.icons.length; ++i) { + if (i == 3) this.icons[i] = iconRegister.registerIcon("minecraft:" + textureNames[i]); + else this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override - public TileEntity createNewTileEntity (World var1, int metadata) - { - switch (metadata % 8) - { - case 0: - return new FurnaceLogic(); + public TileEntity createNewTileEntity(World var1, int metadata) { + switch (metadata % 8) { + case 0: + return new FurnaceLogic(); } return null; } @SideOnly(Side.CLIENT) @Override - public void randomDisplayTick (World world, int x, int y, int z, Random random) - { + public void randomDisplayTick(World world, int x, int y, int z, Random random) { TileEntity logic = world.getTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z); int metaType = meta % 8; int metaPos = meta / 8; - if (metaType == 0) - { - if (((IActiveLogic) logic).getActive()) - { + if (metaType == 0) { + if (((IActiveLogic) logic).getActive()) { float offset = random.nextFloat() * 0.6F - 0.3F; float offsetY = random.nextFloat() * 6.0F / 16.0F; - if (metaPos == 1) - { + if (metaPos == 1) { offsetY += 0.5F; } - if (direction == 4) - { + if (direction == 4) { world.spawnParticle("smoke", x - 0.02F, y + offsetY, z + offset + 0.5F, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", x - 0.02F, y + offsetY, z + offset + 0.5F, 0.0D, 0.0D, 0.0D); - } - else if (direction == 5) - { + } else if (direction == 5) { world.spawnParticle("smoke", x + 1.02F, y + offsetY, z + offset + 0.5F, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", x + 1.02F, y + offsetY, z + offset + 0.5F, 0.0D, 0.0D, 0.0D); - } - else if (direction == 2) - { + } else if (direction == 2) { world.spawnParticle("smoke", x + offset + 0.5F, y + offsetY, z - 0.02F, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", x + offset + 0.5F, y + offsetY, z - 0.02F, 0.0D, 0.0D, 0.0D); - } - else if (direction == 3) - { + } else if (direction == 3) { world.spawnParticle("smoke", x + offset + 0.5F, y + offsetY, z + 1.02F, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", x + offset + 0.5F, y + offsetY, z + 1.02F, 0.0D, 0.0D, 0.0D); } diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java index 3ff71c12e32..f521bb7f0f1 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -9,109 +9,126 @@ import net.minecraft.world.*; import tconstruct.blocks.TConstructBlock; -public class MultiBrick extends TConstructBlock -{ - static String blockTextures[] = { "brick_obsidian", "brick_sandstone", "brick_netherrack", "brick_stone_refined", "brick_iron", "brick_gold", "brick_lapis", "brick_diamond", "brick_redstone", "brick_bone", "brick_slime", "brick_blueslime", "brick_endstone", "brick_obsidian_ingot" }; +public class MultiBrick extends TConstructBlock { + static String blockTextures[] = { + "brick_obsidian", + "brick_sandstone", + "brick_netherrack", + "brick_stone_refined", + "brick_iron", + "brick_gold", + "brick_lapis", + "brick_diamond", + "brick_redstone", + "brick_bone", + "brick_slime", + "brick_blueslime", + "brick_endstone", + "brick_obsidian_ingot" + }; - public MultiBrick() - { + public MultiBrick() { super(Material.rock, 3f, blockTextures); } @Override - public float getBlockHardness (World world, int x, int y, int z) - { + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) - { - case 0: - return Blocks.obsidian.getBlockHardness(world, x, y, z); - case 1: - return Blocks.sandstone.getBlockHardness(world, x, y, z); - case 2: - return Blocks.netherrack.getBlockHardness(world, x, y, z); - case 3: - return Blocks.stone.getBlockHardness(world, x, y, z); - case 4: - return Blocks.iron_block.getBlockHardness(world, x, y, z); - case 5: - return Blocks.gold_block.getBlockHardness(world, x, y, z); - case 6: - return Blocks.lapis_block.getBlockHardness(world, x, y, z); - case 7: - return Blocks.diamond_block.getBlockHardness(world, x, y, z); - case 8: - return Blocks.redstone_block.getBlockHardness(world, x, y, z); - case 9: - return 1.0F; - case 10: - return 1.5F; - case 11: - return 1.5F; - case 12: - return Blocks.end_stone.getBlockHardness(world, x, y, z); - case 13: - return Blocks.obsidian.getBlockHardness(world, x, y, z); - default: - return blockHardness; + switch (meta) { + case 0: + return Blocks.obsidian.getBlockHardness(world, x, y, z); + case 1: + return Blocks.sandstone.getBlockHardness(world, x, y, z); + case 2: + return Blocks.netherrack.getBlockHardness(world, x, y, z); + case 3: + return Blocks.stone.getBlockHardness(world, x, y, z); + case 4: + return Blocks.iron_block.getBlockHardness(world, x, y, z); + case 5: + return Blocks.gold_block.getBlockHardness(world, x, y, z); + case 6: + return Blocks.lapis_block.getBlockHardness(world, x, y, z); + case 7: + return Blocks.diamond_block.getBlockHardness(world, x, y, z); + case 8: + return Blocks.redstone_block.getBlockHardness(world, x, y, z); + case 9: + return 1.0F; + case 10: + return 1.5F; + case 11: + return 1.5F; + case 12: + return Blocks.end_stone.getBlockHardness(world, x, y, z); + case 13: + return Blocks.obsidian.getBlockHardness(world, x, y, z); + default: + return blockHardness; } } @Override - public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) - { + public float getExplosionResistance( + Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) - { - case 0: - return Blocks.obsidian.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 1: - return Blocks.sandstone.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 2: - return Blocks.netherrack.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 3: - return Blocks.stone.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 4: - return Blocks.iron_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 5: - return Blocks.gold_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 6: - return Blocks.lapis_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 7: - return Blocks.diamond_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 8: - return Blocks.redstone_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 9: - return 1.0F; - case 10: - return 1.5F; - case 11: - return 1.5F; - case 12: - return Blocks.end_stone.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 13: - return Blocks.obsidian.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - default: - return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + switch (meta) { + case 0: + return Blocks.obsidian.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 1: + return Blocks.sandstone.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 2: + return Blocks.netherrack.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 3: + return Blocks.stone.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 4: + return Blocks.iron_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 5: + return Blocks.gold_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 6: + return Blocks.lapis_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 7: + return Blocks.diamond_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 8: + return Blocks.redstone_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 9: + return 1.0F; + case 10: + return 1.5F; + case 11: + return 1.5F; + case 12: + return Blocks.end_stone.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 13: + return Blocks.obsidian.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + default: + return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); } } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 10 || meta == 11) - { - if (entity.motionY < 0) - entity.motionY *= -1.2F; + if (meta == 10 || meta == 11) { + if (entity.motionY < 0) entity.motionY *= -1.2F; entity.fallDistance = 0; } } // TODO getCollisionBoundingBoxFromPool @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); @@ -123,37 +140,30 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, */ @Override - public boolean canProvidePower () - { + public boolean canProvidePower() { return true; } @Override - public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) - { - if (world.getBlockMetadata(x, y, z) == 8) - return 4; + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + if (world.getBlockMetadata(x, y, z) == 8) return 4; return 0; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:bricks/" + textureNames[i]); } } @Override - public boolean isNormalCube (IBlockAccess world, int x, int y, int z) - { + public boolean isNormalCube(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta != 8) - { + if (meta != 8) { return true; } return super.isNormalCube(world, x, y, z); diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index a432cbcec77..d4726d7d098 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -9,114 +9,133 @@ import net.minecraft.world.*; import tconstruct.blocks.TConstructBlock; -public class MultiBrickFancy extends TConstructBlock -{ - static String blockTextures[] = { "fancybrick_obsidian", "fancybrick_sandstone", "fancybrick_netherrack", "fancybrick_stone_refined", "fancybrick_iron", "fancybrick_gold", "fancybrick_lapis", "fancybrick_diamond", "fancybrick_redstone", "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot", "fancybrick_stone", "road_stone" }; +public class MultiBrickFancy extends TConstructBlock { + static String blockTextures[] = { + "fancybrick_obsidian", + "fancybrick_sandstone", + "fancybrick_netherrack", + "fancybrick_stone_refined", + "fancybrick_iron", + "fancybrick_gold", + "fancybrick_lapis", + "fancybrick_diamond", + "fancybrick_redstone", + "fancybrick_bone", + "fancybrick_slime", + "fancybrick_blueslime", + "fancybrick_endstone", + "fancybrick_obsidian_ingot", + "fancybrick_stone", + "road_stone" + }; - public MultiBrickFancy() - { + public MultiBrickFancy() { super(Material.rock, 3f, blockTextures); } // TODO getBlockHardness @Override - public float getBlockHardness (World world, int x, int y, int z) - { + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) - { - case 0: - return Blocks.obsidian.getBlockHardness(world, x, y, z); - case 1: - return Blocks.sandstone.getBlockHardness(world, x, y, z); - case 2: - return Blocks.netherrack.getBlockHardness(world, x, y, z); - case 4: - return Blocks.iron_block.getBlockHardness(world, x, y, z); - case 5: - return Blocks.gold_block.getBlockHardness(world, x, y, z); - case 6: - return Blocks.lapis_block.getBlockHardness(world, x, y, z); - case 7: - return Blocks.diamond_block.getBlockHardness(world, x, y, z); - case 8: - return Blocks.redstone_block.getBlockHardness(world, x, y, z); - case 9: - return 1.0F; - case 10: - return 1.5F; - case 11: - return 1.5F; - case 12: - return Blocks.end_stone.getBlockHardness(world, x, y, z); - case 13: - return Blocks.obsidian.getBlockHardness(world, x, y, z); - case 3: - case 14: - case 15: - return Blocks.stone.getBlockHardness(world, x, y, z); - default: - return blockHardness; + switch (meta) { + case 0: + return Blocks.obsidian.getBlockHardness(world, x, y, z); + case 1: + return Blocks.sandstone.getBlockHardness(world, x, y, z); + case 2: + return Blocks.netherrack.getBlockHardness(world, x, y, z); + case 4: + return Blocks.iron_block.getBlockHardness(world, x, y, z); + case 5: + return Blocks.gold_block.getBlockHardness(world, x, y, z); + case 6: + return Blocks.lapis_block.getBlockHardness(world, x, y, z); + case 7: + return Blocks.diamond_block.getBlockHardness(world, x, y, z); + case 8: + return Blocks.redstone_block.getBlockHardness(world, x, y, z); + case 9: + return 1.0F; + case 10: + return 1.5F; + case 11: + return 1.5F; + case 12: + return Blocks.end_stone.getBlockHardness(world, x, y, z); + case 13: + return Blocks.obsidian.getBlockHardness(world, x, y, z); + case 3: + case 14: + case 15: + return Blocks.stone.getBlockHardness(world, x, y, z); + default: + return blockHardness; } } @Override - public float getExplosionResistance (Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) - { + public float getExplosionResistance( + Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) - { - case 0: - return Blocks.obsidian.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 1: - return Blocks.sandstone.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 2: - return Blocks.netherrack.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 4: - return Blocks.iron_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 5: - return Blocks.gold_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 6: - return Blocks.lapis_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 7: - return Blocks.diamond_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 8: - return Blocks.redstone_block.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 9: - return 1.0F; - case 10: - return 1.5F; - case 11: - return 1.5F; - case 12: - return Blocks.end_stone.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 13: - return Blocks.obsidian.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 3: - case 14: - case 15: - return Blocks.stone.getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - default: - return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + switch (meta) { + case 0: + return Blocks.obsidian.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 1: + return Blocks.sandstone.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 2: + return Blocks.netherrack.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 4: + return Blocks.iron_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 5: + return Blocks.gold_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 6: + return Blocks.lapis_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 7: + return Blocks.diamond_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 8: + return Blocks.redstone_block.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 9: + return 1.0F; + case 10: + return 1.5F; + case 11: + return 1.5F; + case 12: + return Blocks.end_stone.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 13: + return Blocks.obsidian.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 3: + case 14: + case 15: + return Blocks.stone.getExplosionResistance( + entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + default: + return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); } } // TODO onEntityCollidedWithBlock @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 10 || meta == 11) - { - if (entity.motionY < 0) - entity.motionY *= -1.2F; + if (meta == 10 || meta == 11) { + if (entity.motionY < 0) entity.motionY *= -1.2F; entity.fallDistance = 0; } } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); @@ -128,37 +147,30 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, */ @Override - public boolean canProvidePower () - { + public boolean canProvidePower() { return true; } @Override - public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) - { - if (world.getBlockMetadata(x, y, z) == 8) - return 4; + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + if (world.getBlockMetadata(x, y, z) == 8) return 4; return 0; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:bricks/" + textureNames[i]); } } @Override - public boolean isNormalCube (IBlockAccess world, int x, int y, int z) - { + public boolean isNormalCube(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta != 8) - { + if (meta != 8) { return true; } return super.isNormalCube(world, x, y, z); diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java index df7ae4b78ed..a39b6e5c1d3 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java @@ -9,22 +9,28 @@ import tconstruct.blocks.TConstructBlock; public class MultiBrickMetal extends TConstructBlock { - static String blockTextures[] = { "brick_alumite", "brick_ardite", "brick_cobalt", "brick_manyullyn", "fancybrick_alumite", "fancybrick_ardite", "fancybrick_cobalt", "fancybrick_manyullyn"}; + static String blockTextures[] = { + "brick_alumite", + "brick_ardite", + "brick_cobalt", + "brick_manyullyn", + "fancybrick_alumite", + "fancybrick_ardite", + "fancybrick_cobalt", + "fancybrick_manyullyn" + }; - public MultiBrickMetal() - { + public MultiBrickMetal() { super(Material.iron, 10f, blockTextures); this.setStepSound(Block.soundTypeMetal); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:bricks/" + textureNames[i]); } } diff --git a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index f58c74ac0d3..4c985647bbc 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -21,63 +21,69 @@ import tconstruct.tools.model.TableRender; import tconstruct.world.TinkerWorld; -public class ToolForgeBlock extends InventoryBlock -{ +public class ToolForgeBlock extends InventoryBlock { - public ToolForgeBlock(Material material) - { + public ToolForgeBlock(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(2f); this.setStepSound(Block.soundTypeMetal); } - String[] textureNames = { "toolforge_iron", "toolforge_gold", "toolforge_diamond", "toolforge_emerald", "toolforge_cobalt", "toolforge_ardite", "toolforge_manyullyn", "toolforge_copper", "toolforge_bronze", "toolforge_tin", "toolforge_aluminum", "toolforge_alubrass", "toolforge_alumite", "toolforge_steel" }; + String[] textureNames = { + "toolforge_iron", + "toolforge_gold", + "toolforge_diamond", + "toolforge_emerald", + "toolforge_cobalt", + "toolforge_ardite", + "toolforge_manyullyn", + "toolforge_copper", + "toolforge_bronze", + "toolforge_tin", + "toolforge_aluminum", + "toolforge_alubrass", + "toolforge_alumite", + "toolforge_steel" + }; /* Rendering */ @Override - public String[] getTextureNames () - { + public String[] getTextureNames() { return textureNames; } @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } IIcon textureTop; @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { super.registerBlockIcons(iconRegister); textureTop = iconRegister.registerIcon("tinker:toolforge_top"); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (side == 1) - { + public IIcon getIcon(int side, int meta) { + if (side == 1) { return textureTop; } - if (side == 0) - { - switch (meta) - { - case 0: - return Blocks.iron_block.getIcon(side, 0); - case 1: - return Blocks.gold_block.getIcon(side, 0); - case 2: - return Blocks.diamond_block.getIcon(side, 0); - case 3: - return Blocks.emerald_block.getIcon(side, 0); - default: - return TinkerWorld.metalBlock.getIcon(side, meta - 4); + if (side == 0) { + switch (meta) { + case 0: + return Blocks.iron_block.getIcon(side, 0); + case 1: + return Blocks.gold_block.getIcon(side, 0); + case 2: + return Blocks.diamond_block.getIcon(side, 0); + case 3: + return Blocks.emerald_block.getIcon(side, 0); + default: + return TinkerWorld.metalBlock.getIcon(side, meta - 4); } } @@ -85,58 +91,48 @@ public IIcon getIcon (int side, int meta) } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public boolean isSideSolid (IBlockAccess world, int x, int y, int z, ForgeDirection side) - { + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { return side == ForgeDirection.UP; } @Override - public int getRenderType () - { + public int getRenderType() { return TableRender.model; } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { + public TileEntity createNewTileEntity(World world, int metadata) { return new ToolForgeLogic(); } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { return ToolProxyCommon.toolForgeID; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < textureNames.length; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < textureNames.length; iter++) { list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index d30498b607a..4ed9108ae8f 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -22,166 +22,180 @@ import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; -public class ToolStationBlock extends InventoryBlock -{ - public ToolStationBlock(Material material) - { +public class ToolStationBlock extends InventoryBlock { + public ToolStationBlock(Material material) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(2f); this.setStepSound(Block.soundTypeWood); } - //Block.hasComparatorInputOverride and Block.getComparatorInputOverride + // Block.hasComparatorInputOverride and Block.getComparatorInputOverride /* Rendering */ @Override - public String[] getTextureNames () - { - String[] textureNames = { "toolstation_top", "toolstation_side", "toolstation_bottom", "partbuilder_oak_top", "partbuilder_oak_side", "partbuilder_oak_bottom", "partbuilder_spruce_top", "partbuilder_spruce_side", "partbuilder_spruce_bottom", "partbuilder_birch_top", "partbuilder_birch_side", "partbuilder_birch_bottom", "partbuilder_jungle_top", "partbuilder_jungle_side", "partbuilder_jungle_bottom", "patternchest_top", "patternchest_side", "patternchest_bottom", "stenciltable_oak_top", "stenciltable_oak_side", "stenciltable_oak_bottom", "stenciltable_spruce_top", "stenciltable_spruce_side", "stenciltable_spruce_bottom", "stenciltable_birch_top", "stenciltable_birch_side", "stenciltable_birch_bottom", "stenciltable_jungle_top", "stenciltable_jungle_side", "stenciltable_jungle_bottom" }; + public String[] getTextureNames() { + String[] textureNames = { + "toolstation_top", + "toolstation_side", + "toolstation_bottom", + "partbuilder_oak_top", + "partbuilder_oak_side", + "partbuilder_oak_bottom", + "partbuilder_spruce_top", + "partbuilder_spruce_side", + "partbuilder_spruce_bottom", + "partbuilder_birch_top", + "partbuilder_birch_side", + "partbuilder_birch_bottom", + "partbuilder_jungle_top", + "partbuilder_jungle_side", + "partbuilder_jungle_bottom", + "patternchest_top", + "patternchest_side", + "patternchest_bottom", + "stenciltable_oak_top", + "stenciltable_oak_side", + "stenciltable_oak_bottom", + "stenciltable_spruce_top", + "stenciltable_spruce_side", + "stenciltable_spruce_bottom", + "stenciltable_birch_top", + "stenciltable_birch_side", + "stenciltable_birch_bottom", + "stenciltable_jungle_top", + "stenciltable_jungle_side", + "stenciltable_jungle_bottom" + }; return textureNames; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta <= 4) - { + public IIcon getIcon(int side, int meta) { + if (meta <= 4) { return icons[meta * 3 + getTextureIndex(side)]; - } - else if (meta <= 9) - { + } else if (meta <= 9) { return icons[15 + getTextureIndex(side)]; - } - else - { + } else { return icons[meta * 3 + getTextureIndex(side) - 12]; } } - public int getTextureIndex (int side) - { - if (side == 0) - return 2; - if (side == 1) - return 0; + public int getTextureIndex(int side) { + if (side == 0) return 2; + if (side == 1) return 0; return 1; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public boolean isSideSolid (IBlockAccess world, int x, int y, int z, ForgeDirection side) - { + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { return side == ForgeDirection.UP; } @Override - public int getRenderType () - { + public int getRenderType() { return TableRender.model; } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); - return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); + return AxisAlignedBB.getBoundingBox( + (double) x + this.minX, + (double) y + this.minY, + (double) z + this.minZ, + (double) x + this.maxX, + (double) y + this.maxY - 0.125, + (double) z + this.maxZ); + return AxisAlignedBB.getBoundingBox( + (double) x + this.minX, + (double) y + this.minY, + (double) z + this.minZ, + (double) x + this.maxX, + (double) y + this.maxY, + (double) z + this.maxZ); } @Override - public TileEntity createNewTileEntity (World world, int metadata) - { - switch (metadata) - { - case 0: - return new ToolStationLogic(); - case 1: - return new PartBuilderLogic(); - case 2: - return new PartBuilderLogic(); - case 3: - return new PartBuilderLogic(); - case 4: - return new PartBuilderLogic(); - case 5: - return new PatternChestLogic(); - case 6: - return new PatternChestLogic(); - case 7: - return new PatternChestLogic(); - case 8: - return new PatternChestLogic(); - case 9: - return new PatternChestLogic(); - case 10: - return new StencilTableLogic(); - case 11: - return new StencilTableLogic(); - case 12: - return new StencilTableLogic(); - case 13: - return new StencilTableLogic(); - /*case 14: - return new CastingTableLogic();*/ - default: - return null; + public TileEntity createNewTileEntity(World world, int metadata) { + switch (metadata) { + case 0: + return new ToolStationLogic(); + case 1: + return new PartBuilderLogic(); + case 2: + return new PartBuilderLogic(); + case 3: + return new PartBuilderLogic(); + case 4: + return new PartBuilderLogic(); + case 5: + return new PatternChestLogic(); + case 6: + return new PatternChestLogic(); + case 7: + return new PatternChestLogic(); + case 8: + return new PatternChestLogic(); + case 9: + return new PatternChestLogic(); + case 10: + return new StencilTableLogic(); + case 11: + return new StencilTableLogic(); + case 12: + return new StencilTableLogic(); + case 13: + return new StencilTableLogic(); + /*case 14: + return new CastingTableLogic();*/ + default: + return null; } } @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { + public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { int md = world.getBlockMetadata(x, y, z); - if (md == 0) - return 0; - else if (md < 5) - return 1; - else if (md < 10) - return 2; - else - return 3; + if (md == 0) return 0; + else if (md < 5) return 1; + else if (md < 10) return 2; + else return 3; - //return -1; + // return -1; } @Override - public Object getModInstance () - { + public Object getModInstance() { return TConstruct.instance; } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 6; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 6; iter++) { list.add(new ItemStack(id, 1, iter)); } - for (int iter = 10; iter < 14; iter++) - { + for (int iter = 10; iter < 14; iter++) { list.add(new ItemStack(id, 1, iter)); } } @@ -206,22 +220,18 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase }*/ @Override - public String getTextureDomain (int textureNameIndex) - { + public String getTextureDomain(int textureNameIndex) { return "tinker"; } /* Keep pattern chest inventory */ @Override - public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) - { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { player.addExhaustion(0.025F); - if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) - { + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { int meta = world.getBlockMetadata(x, y, z); - if (meta >= 5 && meta <= 9) - { + if (meta >= 5 && meta <= 9) { ItemStack chest = new ItemStack(this, 1, 5); NBTTagCompound inventory = new NBTTagCompound(); PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); @@ -232,17 +242,16 @@ public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, // remove content. This is necessary because otherwise the patterns would also spill into the world // we don't want to prevent that since that's the intended behaviour for explosions. - for(int i = 0; i < logic.getSizeInventory(); i++) - logic.setInventorySlotContents(i, null); + for (int i = 0; i < logic.getSizeInventory(); i++) logic.setInventorySlotContents(i, null); - //Spawn item - if (!player.capabilities.isCreativeMode || player.isSneaking()) - { + // Spawn item + if (!player.capabilities.isCreativeMode || player.isSneaking()) { float f = 0.7F; double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, chest); + EntityItem entityitem = + new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, chest); entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); } @@ -252,23 +261,18 @@ public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, } @Override - public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) - { - if (meta < 5 || meta > 9) - super.harvestBlock(world, player, x, y, z, meta); - //Do nothing + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { + if (meta < 5 || meta > 9) super.harvestBlock(world, player, x, y, z, meta); + // Do nothing } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) - { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) { boolean keptInventory = false; - if (stack.hasTagCompound()) - { + if (stack.hasTagCompound()) { NBTTagCompound inventory = stack.getTagCompound().getCompoundTag("Inventory"); TileEntity te = world.getTileEntity(x, y, z); - if (inventory != null && te instanceof PatternChestLogic) - { + if (inventory != null && te instanceof PatternChestLogic) { PatternChestLogic logic = (PatternChestLogic) te; logic.readInventoryFromNBT(inventory); logic.xCoord = x; @@ -277,14 +281,11 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase keptInventory = true; } } - if (!keptInventory && PHConstruct.freePatterns) - { + if (!keptInventory && PHConstruct.freePatterns) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 5) - { + if (meta == 5) { PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); - for (int i = 1; i <= 13; i++) - { + for (int i = 1; i <= 13; i++) { logic.setInventorySlotContents(i - 1, new ItemStack(TinkerTools.woodPattern, 1, i)); } logic.setInventorySlotContents(13, new ItemStack(TinkerTools.woodPattern, 1, 22)); @@ -292,4 +293,4 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase } super.onBlockPlacedBy(world, x, y, z, living, stack); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java b/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java index da953c912e6..015ddeacfbf 100644 --- a/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java +++ b/src/main/java/tconstruct/tools/client/DaggerEntityRenderer.java @@ -18,8 +18,7 @@ public void customRendering(DaggerEntity entity, double x, double y, double z, f // it rotates! GL11.glRotatef(entity.roll, 0f, 0f, 1f); - // also make it a bit thicker - toolCoreRenderer.setDepth(1/20f); + toolCoreRenderer.setDepth(1 / 20f); } } diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index cab200912ad..7351ec69afc 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -18,21 +18,18 @@ import net.minecraft.world.World; @Deprecated -public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnData -{ +public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnData { public ItemStack returnStack; public float mass; public int baseDamage; private float knockbackStrengthMod; Random random = new Random(); - public ArrowEntity(World par1World) - { + public ArrowEntity(World par1World) { super(par1World); } - public ArrowEntity(World world, EntityLivingBase living, float baseSpeed, ItemStack stack) - { + public ArrowEntity(World world, EntityLivingBase living, float baseSpeed, ItemStack stack) { super(world, living, baseSpeed); this.returnStack = stack; NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); @@ -40,8 +37,7 @@ public ArrowEntity(World world, EntityLivingBase living, float baseSpeed, ItemSt this.baseDamage = toolTag.getInteger("Attack"); } - public ArrowEntity(World world, double x, double y, double z, ItemStack stack) - { + public ArrowEntity(World world, double x, double y, double z, ItemStack stack) { super(world, x, y, z); this.returnStack = stack; NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); @@ -50,76 +46,66 @@ public ArrowEntity(World world, double x, double y, double z, ItemStack stack) } @Override - public void onCollideWithPlayer (EntityPlayer par1EntityPlayer) - { - if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) - { - boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; - - if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(returnStack)) - { + public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) { + if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { + boolean flag = + this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; + + if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(returnStack)) { flag = false; } - if (flag) - { - this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + if (flag) { + this.playSound( + "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); par1EntityPlayer.onItemPickup(this, 1); - if(returnStack.stackSize <= 0 || this.canBePickedUp == 2) - this.setDead(); + if (returnStack.stackSize <= 0 || this.canBePickedUp == 2) this.setDead(); } } } @Override - public void onUpdate () - { + public void onUpdate() { this.onEntityUpdate(); - if (returnStack == null || returnStack.stackSize < 1) - { + if (returnStack == null || returnStack.stackSize < 1) { this.setDead(); } - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) - { + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + this.prevRotationYaw = + this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.prevRotationPitch = + this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); } Block i = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); i.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool( + this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) - { + if (axisalignedbb != null + && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { this.inGround = true; } - if (this.arrowShake > 0) - { + if (this.arrowShake > 0) { --this.arrowShake; } - if (this.inGround) - { - if (!worldObj.isRemote) - { + if (this.inGround) { + if (!worldObj.isRemote) { Block j = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); int k = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); - if (j == this.field_145790_g && k == this.inData) - { + if (j == this.field_145790_g && k == this.inData) { ++this.ticksInGround; - if (this.ticksInGround == 120000) - { + if (this.ticksInGround == 120000) { this.setDead(); } - } - else - { + } else { this.inGround = false; this.motionX *= (double) (this.rand.nextFloat() * 0.2F); this.motionY *= (double) (this.rand.nextFloat() * 0.2F); @@ -128,43 +114,46 @@ public void onUpdate () this.ticksInAir = 0; } } - } - else - { + } else { ++this.ticksInAir; Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 vec31 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 vec31 = Vec3.createVectorHelper( + this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec31, false, true, false); vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - vec31 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - - if (movingobjectposition != null) - { - vec31 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + vec31 = Vec3.createVectorHelper( + this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + + if (movingobjectposition != null) { + vec31 = Vec3.createVectorHelper( + movingobjectposition.hitVec.xCoord, + movingobjectposition.hitVec.yCoord, + movingobjectposition.hitVec.zCoord); } Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( + this, + this.boundingBox + .addCoord(this.motionX, this.motionY, this.motionZ) + .expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; int l; float ySpeed; - for (l = 0; l < list.size(); ++l) - { + for (l = 0; l < list.size(); ++l) { Entity entity1 = (Entity) list.get(l); - if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) - { + if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { ySpeed = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand((double) ySpeed, (double) ySpeed, (double) ySpeed); + AxisAlignedBB axisalignedbb1 = + entity1.boundingBox.expand((double) ySpeed, (double) ySpeed, (double) ySpeed); MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3, vec31); - if (movingobjectposition1 != null) - { + if (movingobjectposition1 != null) { double d1 = vec3.distanceTo(movingobjectposition1.hitVec); - if (d1 < d0 || d0 == 0.0D) - { + if (d1 < d0 || d0 == 0.0D) { entity = entity1; d0 = d1; } @@ -172,17 +161,18 @@ public void onUpdate () } } - if (entity != null) - { + if (entity != null) { movingobjectposition = new MovingObjectPosition(entity); } - if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) - { + if (movingobjectposition != null + && movingobjectposition.entityHit != null + && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; - if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) - { + if (entityplayer.capabilities.disableDamage + || this.shootingEntity instanceof EntityPlayer + && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { movingobjectposition = null; } } @@ -190,50 +180,40 @@ public void onUpdate () float speed; float f3; - if (movingobjectposition != null) - { - if (movingobjectposition.entityHit != null) - { - speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + if (movingobjectposition != null) { + if (movingobjectposition.entityHit != null) { + speed = MathHelper.sqrt_double( + this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); double damageSpeed = (double) speed * this.getDamage(); damageSpeed *= baseDamage; damageSpeed /= 5D; int damageInflicted = MathHelper.ceiling_double_int(damageSpeed); - if (this.getIsCritical()) - { + if (this.getIsCritical()) { damageInflicted += this.rand.nextInt(damageInflicted / 2 + 2); } DamageSource damagesource = null; - if (this.shootingEntity == null) - { + if (this.shootingEntity == null) { damagesource = DamageSource.causeArrowDamage(this, this); - } - else - { + } else { damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); } - if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) - { + if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) { movingobjectposition.entityHit.setFire(5); } - if (returnStack.hasTagCompound()) - { + if (returnStack.hasTagCompound()) { int fireAspect = 0; NBTTagCompound toolTags = returnStack.getTagCompound().getCompoundTag("InfiTool"); - if (toolTags.hasKey("Fiery") || toolTags.hasKey("Lava")) - { + if (toolTags.hasKey("Fiery") || toolTags.hasKey("Lava")) { fireAspect *= 4; - if (toolTags.hasKey("Fiery")) - { + if (toolTags.hasKey("Fiery")) { fireAspect += toolTags.getInteger("Fiery") / 5 + 1; } - if (toolTags.getBoolean("Lava")) - { + if (toolTags.getBoolean("Lava")) { fireAspect += 3; } entity.setFire(fireAspect); @@ -244,40 +224,41 @@ public void onUpdate () ((EntityLiving) shootingEntity).heal(random.nextInt(drain + 1)); } - if (movingobjectposition.entityHit.attackEntityFrom(damagesource, damageInflicted)) - { - if (movingobjectposition.entityHit instanceof EntityLivingBase) - { + if (movingobjectposition.entityHit.attackEntityFrom(damagesource, damageInflicted)) { + if (movingobjectposition.entityHit instanceof EntityLivingBase) { EntityLivingBase entityliving = (EntityLivingBase) movingobjectposition.entityHit; - if (!this.worldObj.isRemote) - { + if (!this.worldObj.isRemote) { entityliving.setArrowCountInEntity(entityliving.getArrowCountInEntity() + 1); } - if (this.knockbackStrength > 0 || this.knockbackStrengthMod > 0) - { + if (this.knockbackStrength > 0 || this.knockbackStrengthMod > 0) { f3 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - if (f3 > 0.0F) - { + if (f3 > 0.0F) { float knockback = knockbackStrength + knockbackStrengthMod; - movingobjectposition.entityHit.addVelocity(this.motionX * (double) this.knockbackStrength * 0.6000000238418579D / (double) f3, 0.1D, this.motionZ * (double) knockback * 0.6000000238418579D / (double) f3); + movingobjectposition.entityHit.addVelocity( + this.motionX + * (double) this.knockbackStrength + * 0.6000000238418579D + / (double) f3, + 0.1D, + this.motionZ * (double) knockback * 0.6000000238418579D / (double) f3); } } - if (this.shootingEntity != null) - { + if (this.shootingEntity != null) { damagesource = DamageSource.causeArrowDamage(this, this); - } - else - { + } else { damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); } - if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) - { - ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0)); + if (this.shootingEntity != null + && movingobjectposition.entityHit != this.shootingEntity + && movingobjectposition.entityHit instanceof EntityPlayer + && this.shootingEntity instanceof EntityPlayerMP) { + ((EntityPlayerMP) this.shootingEntity) + .playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0)); // TConstruct.packetPipeline.sendTo(new // S2BPacketChangeGameState(6, 0), // (EntityPlayerMP) this.shootingEntity); @@ -286,26 +267,19 @@ public void onUpdate () this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); - if (!(movingobjectposition.entityHit instanceof EntityEnderman)) - { + if (!(movingobjectposition.entityHit instanceof EntityEnderman)) { this.motionX = 0; this.motionZ = 0; - if (movingobjectposition.entityHit instanceof EntityPlayer) - { + if (movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) movingobjectposition.entityHit; if (canBePickedUp == 2 || player.inventory.addItemStackToInventory(returnStack)) this.setDead(); - } - else if (movingobjectposition.entityHit instanceof EntityLivingBase) - { + } else if (movingobjectposition.entityHit instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) movingobjectposition.entityHit; - if (canBePickedUp == 2 || addItemStackToInventory(returnStack, living)) - this.setDead(); + if (canBePickedUp == 2 || addItemStackToInventory(returnStack, living)) this.setDead(); } } - } - else - { + } else { this.motionX *= -0.10000000149011612D; this.motionY *= -0.10000000149011612D; this.motionZ *= -0.10000000149011612D; @@ -313,18 +287,19 @@ else if (movingobjectposition.entityHit instanceof EntityLivingBase) this.prevRotationYaw += 180.0F; this.ticksInAir = 0; } - } - else - { + } else { this.field_145791_d = movingobjectposition.blockX; this.field_145792_e = movingobjectposition.blockY; this.field_145789_f = movingobjectposition.blockZ; - this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); - this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.field_145790_g = + this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.inData = this.worldObj.getBlockMetadata( + this.field_145791_d, this.field_145792_e, this.field_145789_f); this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); - speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + speed = MathHelper.sqrt_double( + this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); this.posX -= this.motionX / (double) speed * 0.05000000074505806D; this.posY -= this.motionY / (double) speed * 0.05000000074505806D; this.posZ -= this.motionZ / (double) speed * 0.05000000074505806D; @@ -333,18 +308,23 @@ else if (movingobjectposition.entityHit instanceof EntityLivingBase) this.arrowShake = 0; this.setIsCritical(false); - if (this.field_145790_g != Blocks.air) - { - this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); + if (this.field_145790_g != Blocks.air) { + this.field_145790_g.onEntityCollidedWithBlock( + this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); } } } - if (this.getIsCritical()) - { - for (l = 0; l < 4; ++l) - { - this.worldObj.spawnParticle("crit", this.posX + this.motionX * (double) l / 4.0D, this.posY + this.motionY * (double) l / 4.0D, this.posZ + this.motionZ * (double) l / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); + if (this.getIsCritical()) { + for (l = 0; l < 4; ++l) { + this.worldObj.spawnParticle( + "crit", + this.posX + this.motionX * (double) l / 4.0D, + this.posY + this.motionY * (double) l / 4.0D, + this.posZ + this.motionZ * (double) l / 4.0D, + -this.motionX, + -this.motionY + 0.2D, + -this.motionZ); } } @@ -354,23 +334,21 @@ else if (movingobjectposition.entityHit instanceof EntityLivingBase) speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) speed) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) - { + for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) speed) * 180.0D / Math.PI); + this.rotationPitch - this.prevRotationPitch < -180.0F; + this.prevRotationPitch -= 360.0F) { ; } - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) - { + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; } - while (this.rotationYaw - this.prevRotationYaw < -180.0F) - { + while (this.rotationYaw - this.prevRotationYaw < -180.0F) { this.prevRotationYaw -= 360.0F; } - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) - { + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { this.prevRotationYaw += 360.0F; } @@ -380,12 +358,17 @@ else if (movingobjectposition.entityHit instanceof EntityLivingBase) float speedMod = 1.05f + (mass / 1.26F) / 6F; ySpeed = 0.05F * speedMod; - if (this.isInWater()) - { - for (int j1 = 0; j1 < 4; ++j1) - { + if (this.isInWater()) { + for (int j1 = 0; j1 < 4; ++j1) { f3 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle( + "bubble", + this.posX - this.motionX * (double) f3, + this.posY - this.motionY * (double) f3, + this.posZ - this.motionZ * (double) f3, + this.motionX, + this.motionY, + this.motionZ); } dropSpeed = 0.8F; @@ -400,28 +383,20 @@ else if (movingobjectposition.entityHit instanceof EntityLivingBase) } } - public boolean addItemStackToInventory (ItemStack par1ItemStack, EntityLivingBase living) - { - if (par1ItemStack == null) - { + public boolean addItemStackToInventory(ItemStack par1ItemStack, EntityLivingBase living) { + if (par1ItemStack == null) { return false; - } - else - { - try - { + } else { + try { int stackSize; - do - { + do { stackSize = par1ItemStack.stackSize; par1ItemStack.stackSize = this.storePartialItemStack(par1ItemStack, living); } while (par1ItemStack.stackSize > 0 && par1ItemStack.stackSize < stackSize); return par1ItemStack.stackSize < stackSize; - } - catch (Throwable throwable) - { + } catch (Throwable throwable) { CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Adding item to inventory"); CrashReportCategory crashreportcategory = crashreport.makeCategory("Item being added"); // TODO is this needed??? @@ -435,12 +410,9 @@ public boolean addItemStackToInventory (ItemStack par1ItemStack, EntityLivingBas } } - public int getFirstEmptyStack (EntityLivingBase living) - { - for (int i = 0; i < 5; ++i) - { - if (living.getEquipmentInSlot(i) == null) - { + public int getFirstEmptyStack(EntityLivingBase living) { + for (int i = 0; i < 5; ++i) { + if (living.getEquipmentInSlot(i) == null) { return i; } } @@ -448,72 +420,51 @@ public int getFirstEmptyStack (EntityLivingBase living) return -1; } - private int storePartialItemStack (ItemStack par1ItemStack, EntityLivingBase living) - { + private int storePartialItemStack(ItemStack par1ItemStack, EntityLivingBase living) { int stackSize = par1ItemStack.stackSize; int slotID; - if (!par1ItemStack.isStackable()) - { + if (!par1ItemStack.isStackable()) { slotID = this.getFirstEmptyStack(living); - if (slotID < 0) - { + if (slotID < 0) { return stackSize; - } - else - { + } else { living.setCurrentItemOrArmor(slotID, par1ItemStack.copy()); - if (living instanceof EntityLiving) - ((EntityLiving) living).setEquipmentDropChance(slotID, 2.0f); + if (living instanceof EntityLiving) ((EntityLiving) living).setEquipmentDropChance(slotID, 2.0f); return 0; } - } - else - { + } else { slotID = this.storeItemStack(par1ItemStack, living); - if (slotID < 0) - { + if (slotID < 0) { slotID = this.getFirstEmptyStack(living); } - if (slotID < 0) - { + if (slotID < 0) { return stackSize; - } - else - { + } else { ItemStack stack = living.getEquipmentInSlot(slotID); - if (stack == null) - { + if (stack == null) { living.setCurrentItemOrArmor(slotID, par1ItemStack.copy()); - if (living instanceof EntityLiving) - ((EntityLiving) living).setEquipmentDropChance(slotID, 2.0f); + if (living instanceof EntityLiving) ((EntityLiving) living).setEquipmentDropChance(slotID, 2.0f); return 0; - } - else - { + } else { int l = stackSize; - if (stackSize > stack.getMaxStackSize() - stack.stackSize) - { + if (stackSize > stack.getMaxStackSize() - stack.stackSize) { l = stack.getMaxStackSize() - stack.stackSize; } - if (l > 64 - stack.stackSize) - { + if (l > 64 - stack.stackSize) { l = 64 - stack.stackSize; } - if (l == 0) - { + if (l == 0) { return stackSize; - } - else - { + } else { stackSize -= l; stack.stackSize += l; living.setCurrentItemOrArmor(slotID, stack); @@ -527,13 +478,14 @@ private int storePartialItemStack (ItemStack par1ItemStack, EntityLivingBase liv } } - private int storeItemStack (ItemStack par1ItemStack, EntityLivingBase living) - { - for (int slotID = 0; slotID < 5; ++slotID) - { + private int storeItemStack(ItemStack par1ItemStack, EntityLivingBase living) { + for (int slotID = 0; slotID < 5; ++slotID) { ItemStack stack = living.getEquipmentInSlot(slotID); - if (stack != null && stack.isItemEqual(par1ItemStack) && ItemStack.areItemStackTagsEqual(stack, par1ItemStack) && stack.isStackable() && stack.stackSize < stack.getMaxStackSize()) - { + if (stack != null + && stack.isItemEqual(par1ItemStack) + && ItemStack.areItemStackTagsEqual(stack, par1ItemStack) + && stack.isStackable() + && stack.stackSize < stack.getMaxStackSize()) { return slotID; } } @@ -541,30 +493,25 @@ private int storeItemStack (ItemStack par1ItemStack, EntityLivingBase living) return -1; } - public void setKnockbackModStrength (float par1) - { + public void setKnockbackModStrength(float par1) { this.knockbackStrengthMod = par1; } @Override - public void writeEntityToNBT (NBTTagCompound tags) - { + public void writeEntityToNBT(NBTTagCompound tags) { super.writeEntityToNBT(tags); tags.setTag("Throwable", this.returnStack.writeToNBT(new NBTTagCompound())); } @Override - public void readEntityFromNBT (NBTTagCompound tags) - { + public void readEntityFromNBT(NBTTagCompound tags) { super.readEntityFromNBT(tags); this.returnStack = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("Throwable")); } @Override - public void writeSpawnData (ByteBuf data) - { - if (!returnStack.hasTagCompound()) - this.kill(); + public void writeSpawnData(ByteBuf data) { + if (!returnStack.hasTagCompound()) this.kill(); NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool"); ByteBufUtils.writeItemStack(data, returnStack); data.writeFloat(rotationYaw); @@ -574,40 +521,32 @@ public void writeSpawnData (ByteBuf data) data.writeInt(tags.getInteger("RenderAccessory")); int effects = 0; - if (tags.hasKey("Effect1")) - effects++; - if (tags.hasKey("Effect2")) - effects++; - if (tags.hasKey("Effect3")) - effects++; - if (tags.hasKey("Effect4")) - effects++; - if (tags.hasKey("Effect5")) - effects++; - if (tags.hasKey("Effect6")) - effects++; + if (tags.hasKey("Effect1")) effects++; + if (tags.hasKey("Effect2")) effects++; + if (tags.hasKey("Effect3")) effects++; + if (tags.hasKey("Effect4")) effects++; + if (tags.hasKey("Effect5")) effects++; + if (tags.hasKey("Effect6")) effects++; data.writeInt(effects); - switch (effects) - { - case 6: - data.writeInt(tags.getInteger("Effect6")); - case 5: - data.writeInt(tags.getInteger("Effect5")); - case 4: - data.writeInt(tags.getInteger("Effect4")); - case 3: - data.writeInt(tags.getInteger("Effect3")); - case 2: - data.writeInt(tags.getInteger("Effect2")); - case 1: - data.writeInt(tags.getInteger("Effect1")); + switch (effects) { + case 6: + data.writeInt(tags.getInteger("Effect6")); + case 5: + data.writeInt(tags.getInteger("Effect5")); + case 4: + data.writeInt(tags.getInteger("Effect4")); + case 3: + data.writeInt(tags.getInteger("Effect3")); + case 2: + data.writeInt(tags.getInteger("Effect2")); + case 1: + data.writeInt(tags.getInteger("Effect1")); } } @Override - public void readSpawnData (ByteBuf data) - { + public void readSpawnData(ByteBuf data) { returnStack = ByteBufUtils.readItemStack(data); rotationYaw = data.readFloat(); mass = data.readFloat(); @@ -616,27 +555,25 @@ public void readSpawnData (ByteBuf data) toolTag.setInteger("RenderHandle", data.readInt()); toolTag.setInteger("RenderHead", data.readInt()); toolTag.setInteger("RenderAccessory", data.readInt()); - switch (data.readInt()) - { - case 6: - toolTag.setInteger("Effect6", data.readInt()); - case 5: - toolTag.setInteger("Effect5", data.readInt()); - case 4: - toolTag.setInteger("Effect4", data.readInt()); - case 3: - toolTag.setInteger("Effect3", data.readInt()); - case 2: - toolTag.setInteger("Effect2", data.readInt()); - case 1: - toolTag.setInteger("Effect1", data.readInt()); + switch (data.readInt()) { + case 6: + toolTag.setInteger("Effect6", data.readInt()); + case 5: + toolTag.setInteger("Effect5", data.readInt()); + case 4: + toolTag.setInteger("Effect4", data.readInt()); + case 3: + toolTag.setInteger("Effect3", data.readInt()); + case 2: + toolTag.setInteger("Effect2", data.readInt()); + case 1: + toolTag.setInteger("Effect1", data.readInt()); } compound.setTag("InfiTool", toolTag); returnStack.setTagCompound(compound); } - public ItemStack getEntityItem () - { + public ItemStack getEntityItem() { return returnStack; } } diff --git a/src/main/java/tconstruct/tools/entity/DaggerEntity.java b/src/main/java/tconstruct/tools/entity/DaggerEntity.java index 89fd24decaf..83dcc4df19c 100644 --- a/src/main/java/tconstruct/tools/entity/DaggerEntity.java +++ b/src/main/java/tconstruct/tools/entity/DaggerEntity.java @@ -1,16 +1,13 @@ package tconstruct.tools.entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; -import tconstruct.items.tools.Dagger; import tconstruct.library.entity.ProjectileBase; import tconstruct.library.tools.*; -public class DaggerEntity extends ProjectileBase -{ +public class DaggerEntity extends ProjectileBase { public int roll; public DaggerEntity(World world) { @@ -26,31 +23,35 @@ public DaggerEntity(World world, EntityPlayer player, float speed, float accurac float pitch = Math.max(-90f, player.rotationPitch - 20f); // same as in the others, but with pitch upped - this.setLocationAndAngles(player.posX, player.posY + (double)player.getEyeHeight(), player.posZ, player.rotationYaw, pitch); - this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F; + this.setLocationAndAngles( + player.posX, player.posY + (double) player.getEyeHeight(), player.posZ, player.rotationYaw, pitch); + this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; this.posY -= 0.10000000149011612D; - this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F; + this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; this.setPosition(this.posX, this.posY, this.posZ); this.yOffset = 0.0F; - this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI); - this.motionZ = +MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI); - this.motionY = -MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI); + this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); + this.motionZ = +MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) + * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); + this.motionY = -MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI); this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, speed, accuracy); } @Override public void onUpdate() { // you turn me right round baby - if(this.ticksInGround == 0) - roll = (roll + 20) % 360; + if (this.ticksInGround == 0) roll = (roll + 20) % 360; super.onUpdate(); } @Override public void onHitEntity(MovingObjectPosition movingobjectposition) { - AbilityHelper.onLeftClickEntity(returnStack, (EntityPlayer)shootingEntity, movingobjectposition.entityHit, (ToolCore)returnStack.getItem()); - //super.onHitEntity(movingobjectposition); + AbilityHelper.onLeftClickEntity( + returnStack, (EntityPlayer) shootingEntity, movingobjectposition.entityHit, (ToolCore) + returnStack.getItem()); + // super.onHitEntity(movingobjectposition); } @Override diff --git a/src/main/java/tconstruct/tools/entity/FancyEntityItem.java b/src/main/java/tconstruct/tools/entity/FancyEntityItem.java index 0d78fea9b2f..5cc6af883cf 100644 --- a/src/main/java/tconstruct/tools/entity/FancyEntityItem.java +++ b/src/main/java/tconstruct/tools/entity/FancyEntityItem.java @@ -6,31 +6,28 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; -public class FancyEntityItem extends EntityItem -{ - public FancyEntityItem(World par1World, double par2, double par4, double par6) - { +public class FancyEntityItem extends EntityItem { + public FancyEntityItem(World par1World, double par2, double par4, double par6) { super(par1World, par2, par4, par6); this.isImmuneToFire = true; this.lifespan = 72000; } - public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) - { + public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { this(par1World, par2, par4, par6); this.setEntityItemStack(par8ItemStack); - this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); + this.lifespan = (par8ItemStack.getItem() == null + ? 6000 + : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); } - public FancyEntityItem(World par1World) - { + public FancyEntityItem(World par1World) { super(par1World); this.isImmuneToFire = true; this.lifespan = 72000; } - public FancyEntityItem(World world, Entity original, ItemStack stack) - { + public FancyEntityItem(World world, Entity original, ItemStack stack) { this(world, original.posX, original.posY, original.posZ); this.delayBeforeCanPickup = 20; this.motionX = original.motionX; @@ -39,10 +36,8 @@ public FancyEntityItem(World world, Entity original, ItemStack stack) this.setEntityItemStack(stack); } - public boolean attackEntityFrom (DamageSource par1DamageSource, float par2) - { - if (par1DamageSource.getDamageType().equals("outOfWorld")) - return true; + public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + if (par1DamageSource.getDamageType().equals("outOfWorld")) return true; return false; } } diff --git a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java index 0ac7ee67265..ca245dec7af 100644 --- a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java +++ b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java @@ -11,37 +11,31 @@ import net.minecraft.util.*; import net.minecraft.world.World; -public class LaunchedPotion extends EntityThrowable -{ +public class LaunchedPotion extends EntityThrowable { /** * The damage value of the thrown potion that this EntityPotion represents. */ private ItemStack potionDamage; - public LaunchedPotion(World par1World) - { + public LaunchedPotion(World par1World) { super(par1World); } - public LaunchedPotion(World par1World, EntityLivingBase par2EntityLiving, int par3) - { + public LaunchedPotion(World par1World, EntityLivingBase par2EntityLiving, int par3) { this(par1World, par2EntityLiving, new ItemStack(Items.potionitem, 1, par3)); } - public LaunchedPotion(World par1World, EntityLivingBase par2EntityLiving, ItemStack par3ItemStack) - { + public LaunchedPotion(World par1World, EntityLivingBase par2EntityLiving, ItemStack par3ItemStack) { super(par1World, par2EntityLiving); this.potionDamage = par3ItemStack; } @SideOnly(Side.CLIENT) - public LaunchedPotion(World par1World, double par2, double par4, double par6, int par8) - { + public LaunchedPotion(World par1World, double par2, double par4, double par6, int par8) { this(par1World, par2, par4, par6, new ItemStack(Items.potionitem, 1, par8)); } - public LaunchedPotion(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) - { + public LaunchedPotion(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) { super(par1World, par2, par4, par6); this.potionDamage = par8ItemStack; } @@ -50,27 +44,22 @@ public LaunchedPotion(World par1World, double par2, double par4, double par6, It * Gets the amount of gravity to apply to the thrown entity with each tick. */ @Override - protected float getGravityVelocity () - { + protected float getGravityVelocity() { return 0.05F; } @Override - protected float func_70182_d () - { + protected float func_70182_d() { return 1.0F; } @Override - protected float func_70183_g () - { + protected float func_70183_g() { return -10.0F; } - public void setPotionDamage (int par1) - { - if (this.potionDamage == null) - { + public void setPotionDamage(int par1) { + if (this.potionDamage == null) { this.potionDamage = new ItemStack(Items.potionitem, 1, 0); } @@ -81,10 +70,8 @@ public void setPotionDamage (int par1) * Returns the damage value of the thrown potion that this EntityPotion * represents. */ - public int getPotionDamage () - { - if (this.potionDamage == null) - { + public int getPotionDamage() { + if (this.potionDamage == null) { this.potionDamage = new ItemStack(Items.potionitem, 1, 0); } @@ -95,53 +82,43 @@ public int getPotionDamage () * Called when this EntityThrowable hits a block or entity. */ @Override - protected void onImpact (MovingObjectPosition par1MovingObjectPosition) - { - if (!this.worldObj.isRemote) - { + protected void onImpact(MovingObjectPosition par1MovingObjectPosition) { + if (!this.worldObj.isRemote) { List list = Items.potionitem.getEffects(this.potionDamage); - if (list != null && !list.isEmpty()) - { + if (list != null && !list.isEmpty()) { AxisAlignedBB axisalignedbb = this.boundingBox.expand(4.0D, 2.0D, 4.0D); List list1 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); - if (list1 != null && !list1.isEmpty()) - { + if (list1 != null && !list1.isEmpty()) { Iterator iterator = list1.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { EntityLivingBase entityliving = (EntityLivingBase) iterator.next(); double d0 = this.getDistanceSqToEntity(entityliving); - if (d0 < 16.0D) - { + if (d0 < 16.0D) { double d1 = 1.0D - Math.sqrt(d0) / 4.0D; - if (entityliving == par1MovingObjectPosition.entityHit) - { + if (entityliving == par1MovingObjectPosition.entityHit) { d1 = 1.0D; } Iterator iterator1 = list.iterator(); - while (iterator1.hasNext()) - { + while (iterator1.hasNext()) { PotionEffect potioneffect = (PotionEffect) iterator1.next(); int i = potioneffect.getPotionID(); - if (Potion.potionTypes[i].isInstant()) - { - Potion.potionTypes[i].affectEntity(this.getThrower(), entityliving, potioneffect.getAmplifier(), d1); - } - else - { + if (Potion.potionTypes[i].isInstant()) { + Potion.potionTypes[i].affectEntity( + this.getThrower(), entityliving, potioneffect.getAmplifier(), d1); + } else { int j = (int) (d1 * (double) potioneffect.getDuration() + 0.5D); - if (j > 20) - { - entityliving.addPotionEffect(new PotionEffect(i, j, potioneffect.getAmplifier())); + if (j > 20) { + entityliving.addPotionEffect( + new PotionEffect(i, j, potioneffect.getAmplifier())); } } } @@ -150,7 +127,12 @@ protected void onImpact (MovingObjectPosition par1MovingObjectPosition) } } - this.worldObj.playAuxSFX(2002, (int) Math.round(this.posX), (int) Math.round(this.posY), (int) Math.round(this.posZ), this.getPotionDamage()); + this.worldObj.playAuxSFX( + 2002, + (int) Math.round(this.posX), + (int) Math.round(this.posY), + (int) Math.round(this.posZ), + this.getPotionDamage()); this.setDead(); } } @@ -159,21 +141,16 @@ protected void onImpact (MovingObjectPosition par1MovingObjectPosition) * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override - public void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) - { + public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { super.readEntityFromNBT(par1NBTTagCompound); - if (par1NBTTagCompound.hasKey("Potion")) - { + if (par1NBTTagCompound.hasKey("Potion")) { this.potionDamage = ItemStack.loadItemStackFromNBT(par1NBTTagCompound.getCompoundTag("Potion")); - } - else - { + } else { this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); } - if (this.potionDamage == null) - { + if (this.potionDamage == null) { this.setDead(); } } @@ -182,12 +159,10 @@ public void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) * (abstract) Protected helper method to write subclass entity data to NBT. */ @Override - public void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) - { + public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { super.writeEntityToNBT(par1NBTTagCompound); - if (this.potionDamage != null) - { + if (this.potionDamage != null) { par1NBTTagCompound.setTag("Potion", this.potionDamage.writeToNBT(new NBTTagCompound())); } } diff --git a/src/main/java/tconstruct/tools/entity/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java index f591a1b11f3..fbd4c4d8f7c 100644 --- a/src/main/java/tconstruct/tools/entity/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -15,11 +15,9 @@ import tconstruct.library.tools.AbilityHelper; @Deprecated -public class RotatingBase extends Entity implements IEntityAdditionalSpawnData -{ +public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { - public RotatingBase(World world) - { + public RotatingBase(World world) { super(world); texID = 0; tex2ID = 16 * 3; @@ -38,24 +36,28 @@ public RotatingBase(World world) setSize(0.5F, 0.5F); } - public RotatingBase(World world, double d, double d1, double d2) - { + public RotatingBase(World world, double d, double d1, double d2) { this(world); setPosition(d, d1, d2); yOffset = 0.0F; } - public RotatingBase(World world, EntityPlayer entityliving, float f, float f1) - { + public RotatingBase(World world, EntityPlayer entityliving, float f, float f1) { this(world); owner = entityliving; - setLocationAndAngles(entityliving.posX, entityliving.posY + (double) entityliving.getEyeHeight(), entityliving.posZ, entityliving.rotationYaw, entityliving.rotationPitch); + setLocationAndAngles( + entityliving.posX, + entityliving.posY + (double) entityliving.getEyeHeight(), + entityliving.posZ, + entityliving.rotationYaw, + entityliving.rotationPitch); posX -= MathHelper.cos((rotationYaw / 180F) * 3.141593F) * 0.16F; posY -= 0.10000000149011612D; posZ -= MathHelper.sin((rotationYaw / 180F) * 3.141593F) * 0.16F; setPosition(posX, posY, posZ); yOffset = 0.0F; - motionX = -MathHelper.sin((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F); + motionX = + -MathHelper.sin((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F); motionZ = MathHelper.cos((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F); motionY = -MathHelper.sin((rotationPitch / 180F) * 3.141593F - 0.2f); setArrowHeading(motionX, motionY, motionZ, f, f1); @@ -65,26 +67,20 @@ public RotatingBase(World world, EntityPlayer entityliving, float f, float f1) * public void setOnGround(boolean flag) { onGround = flag; * this.dataWatcher.updateObject(6, Byte.valueOf((byte) (flag == true ? 1 : * 0))); } - * + * * public boolean getOnGround() { return * this.dataWatcher.getWatchableObjectByte(0) == 1 ? true : false; } */ @Override - protected void entityInit () - { - } + protected void entityInit() {} - public void damageItem (int i, boolean flag) - { - if (!flag) - { + public void damageItem(int i, boolean flag) { + if (!flag) { return; } - if (returnStack.stackSize < 1) - { - for (int j = 0; j < 8; j++) - { + if (returnStack.stackSize < 1) { + for (int j = 0; j < 8; j++) { worldObj.spawnParticle("snowballpoof", posX, posY, posZ, 0.0D, 0.0D, 0.0D); } @@ -100,19 +96,15 @@ public void damageItem (int i, boolean flag) * mod_Infi2x2.addToInv((EntityPlayer)returnsTo, returnStack, true); } } */ - public void determineRotation () - { + public void determineRotation() { rotationPitch = -57.29578F * (float) Math.atan2(motionY, motionX); double d = Math.sqrt((double) (rotationYaw * rotationYaw) + motionY * motionY); prevRotationYaw = -57.29578F * (float) Math.atan2(motionZ, d); } - public void onHit (MovingObjectPosition movingobjectposition) - { - } + public void onHit(MovingObjectPosition movingobjectposition) {} - public void setArrowHeading (double d, double d1, double d2, float f, float f1) - { + public void setArrowHeading(double d, double d1, double d2, float f, float f1) { float f2 = MathHelper.sqrt_double(d * d + d1 * d1 + d2 * d2); d /= f2; d1 /= f2; @@ -133,13 +125,11 @@ public void setArrowHeading (double d, double d1, double d2, float f, float f1) } @Override - public void setVelocity (double d, double d1, double d2) - { + public void setVelocity(double d, double d1, double d2) { motionX = d; motionY = d1; motionZ = d2; - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) - { + if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(d * d + d2 * d2); prevRotationYaw = rotationYaw = (float) ((Math.atan2(d, d2) * 180D) / 3.1415927410125732D); prevRotationPitch = rotationPitch = (float) ((Math.atan2(d1, f) * 180D) / 3.1415927410125732D); @@ -147,33 +137,26 @@ public void setVelocity (double d, double d1, double d2) } @Override - public void onUpdate () - { + public void onUpdate() { super.onUpdate(); - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) - { + if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); prevRotationYaw = rotationYaw = (float) ((Math.atan2(motionX, motionZ) * 180D) / Math.PI); prevRotationPitch = rotationPitch = (float) ((Math.atan2(motionY, f) * 180D) / Math.PI); } - if (arrowShake > 0) - { + if (arrowShake > 0) { arrowShake--; } - if (onGround) - { + if (onGround) { Block i = worldObj.getBlock(xTile, yTile, zTile); - if (i != inTile) - { + if (i != inTile) { onGround = false; motionX *= rand.nextFloat() * 0.2F; motionY *= rand.nextFloat() * 0.2F; motionZ *= rand.nextFloat() * 0.2F; ticksInGround = 0; ticksInAir = 0; - } - else - { + } else { /* * this.motionX = 0; this.motionY = 0; this.motionZ = 0; */ @@ -181,17 +164,14 @@ public void onUpdate () * ticksInGround++; if (ticksInGround == 1200) { setDead(); } if * (ticksInGround == maxGroundTicks) { setDead(); } */ - if (!hasHitGround) - { + if (!hasHitGround) { hasHitGround = true; damageItem(1, true); } return; } return; - } - else - { + } else { ticksInAir++; } Vec3 vec3d = Vec3.createVectorHelper(posX, posY, posZ); @@ -199,42 +179,39 @@ public void onUpdate () MovingObjectPosition movingobjectposition = worldObj.rayTraceBlocks(vec3d, vec3d1); vec3d = Vec3.createVectorHelper(posX, posY, posZ); vec3d1 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); - if (movingobjectposition != null) - { - vec3d1 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + if (movingobjectposition != null) { + vec3d1 = Vec3.createVectorHelper( + movingobjectposition.hitVec.xCoord, + movingobjectposition.hitVec.yCoord, + movingobjectposition.hitVec.zCoord); } Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity( + this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); double d = 0.0D; - for (int j = 0; j < list.size(); j++) - { + for (int j = 0; j < list.size(); j++) { Entity entity1 = (Entity) list.get(j); - if (!entity1.canBeCollidedWith() || entity1 == owner && ticksInAir < 5) - { + if (!entity1.canBeCollidedWith() || entity1 == owner && ticksInAir < 5) { continue; } float f3 = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.expand(f3, f3, f3); MovingObjectPosition movingobjectposition2 = axisalignedbb.calculateIntercept(vec3d, vec3d1); - if (movingobjectposition2 == null) - { + if (movingobjectposition2 == null) { continue; } double d1 = vec3d.distanceTo(movingobjectposition2.hitVec); - if (d1 < d || d == 0.0D) - { + if (d1 < d || d == 0.0D) { entity = entity1; d = d1; } } - if (entity != null) - { + if (entity != null) { MovingObjectPosition movingobjectposition1 = new MovingObjectPosition(entity); onHit(movingobjectposition1); } - if (movingobjectposition != null) - { + if (movingobjectposition != null) { onHit(movingobjectposition); } posX += motionX; @@ -242,28 +219,27 @@ public void onUpdate () posZ += motionZ; float f1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); rotationYaw = (float) ((Math.atan2(motionX, motionZ) * 180D) / 3.1415927410125732D); - for (rotationPitch = (float) ((Math.atan2(motionY, f1) * 180D) / 3.1415927410125732D); rotationPitch - prevRotationPitch < -180F; prevRotationPitch -= 360F) - { - } - for (; rotationPitch - prevRotationPitch >= 180F; prevRotationPitch += 360F) - { - } - for (; rotationYaw - prevRotationYaw < -180F; prevRotationYaw -= 360F) - { - } - for (; rotationYaw - prevRotationYaw >= 180F; prevRotationYaw += 360F) - { - } + for (rotationPitch = (float) ((Math.atan2(motionY, f1) * 180D) / 3.1415927410125732D); + rotationPitch - prevRotationPitch < -180F; + prevRotationPitch -= 360F) {} + for (; rotationPitch - prevRotationPitch >= 180F; prevRotationPitch += 360F) {} + for (; rotationYaw - prevRotationYaw < -180F; prevRotationYaw -= 360F) {} + for (; rotationYaw - prevRotationYaw >= 180F; prevRotationYaw += 360F) {} rotationPitch = prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F; rotationYaw = prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F; float f2 = 0.99F; float f4 = 0.03F; - if (isInWater()) - { - for (int k = 0; k < 4; k++) - { + if (isInWater()) { + for (int k = 0; k < 4; k++) { float f5 = 0.25F; - worldObj.spawnParticle("bubble", posX - motionX * (double) f5, posY - motionY * (double) f5, posZ - motionZ * (double) f5, motionX, motionY, motionZ); + worldObj.spawnParticle( + "bubble", + posX - motionX * (double) f5, + posY - motionY * (double) f5, + posZ - motionZ * (double) f5, + motionX, + motionY, + motionZ); } f2 = 0.8F; @@ -273,37 +249,33 @@ public void onUpdate () motionZ *= f2; motionY -= f4; setPosition(posX, posY, posZ); - if (!onGround) - { + if (!onGround) { prevBoomerangRotation = boomerangRotation; - for (boomerangRotation += 36F; boomerangRotation > 360F; boomerangRotation -= 360F) - { - } + for (boomerangRotation += 36F; boomerangRotation > 360F; boomerangRotation -= 360F) {} } } /* * public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { * super.readEntityFromNBT(par1NBTTagCompound); - * + * * if (par1NBTTagCompound.hasKey("Potion")) { this.potionDamage = * ItemStack.loadItemStackFromNBT * (par1NBTTagCompound.getCompoundTag("Potion")); } else { * this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); } - * + * * if (this.potionDamage == null) { this.setDead(); } } - * + * * public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { * super.writeEntityToNBT(par1NBTTagCompound); - * + * * if (this.potionDamage != null) { - * + * * } } */ @Override - public void writeEntityToNBT (NBTTagCompound tags) - { + public void writeEntityToNBT(NBTTagCompound tags) { tags.setTag("Throwable", this.returnStack.writeToNBT(new NBTTagCompound())); tags.setShort("xTile", (short) xTile); tags.setShort("yTile", (short) yTile); @@ -315,8 +287,7 @@ public void writeEntityToNBT (NBTTagCompound tags) } @Override - public void readEntityFromNBT (NBTTagCompound tags) - { + public void readEntityFromNBT(NBTTagCompound tags) { // super.readEntityFromNBT(tags); this.returnStack = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("Throwable")); @@ -331,39 +302,32 @@ public void readEntityFromNBT (NBTTagCompound tags) } @Override - public void onCollideWithPlayer (EntityPlayer entityplayer) - { + public void onCollideWithPlayer(EntityPlayer entityplayer) { onCollideWithPlayer(entityplayer, true); } - public void onCollideWithPlayer (EntityPlayer entityplayer, boolean flag) - { - if (returnStack == null || returnStack.stackSize == 0 || worldObj.isRemote) - { + public void onCollideWithPlayer(EntityPlayer entityplayer, boolean flag) { + if (returnStack == null || returnStack.stackSize == 0 || worldObj.isRemote) { return; } - if (!flag || onGround && arrowShake <= 0) - { - if (!flag || returnsTo != null && !returnsTo.isDead && returnsTo != entityplayer) - { + if (!flag || onGround && arrowShake <= 0) { + if (!flag || returnsTo != null && !returnsTo.isDead && returnsTo != entityplayer) { return; } - if (!doNotRetrieve) - AbilityHelper.addToInv(entityplayer, returnStack, true); - worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + if (!doNotRetrieve) AbilityHelper.addToInv(entityplayer, returnStack, true); + worldObj.playSoundAtEntity( + this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); entityplayer.onItemPickup(this, 1); kill(); } } @Override - public float getShadowSize () - { + public float getShadowSize() { return 0.0F; } - public ItemStack getEntityItem () - { + public ItemStack getEntityItem() { return returnStack; } @@ -391,8 +355,7 @@ public ItemStack getEntityItem () public boolean doNotRetrieve; @Override - public void writeSpawnData (ByteBuf data) - { + public void writeSpawnData(ByteBuf data) { NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool"); ByteBufUtils.writeItemStack(data, returnStack); data.writeFloat(rotationYaw); @@ -402,40 +365,32 @@ public void writeSpawnData (ByteBuf data) data.writeInt(tags.getInteger("RenderExtra")); int effects = 0; - if (tags.hasKey("Effect1")) - effects++; - if (tags.hasKey("Effect2")) - effects++; - if (tags.hasKey("Effect3")) - effects++; - if (tags.hasKey("Effect4")) - effects++; - if (tags.hasKey("Effect5")) - effects++; - if (tags.hasKey("Effect6")) - effects++; + if (tags.hasKey("Effect1")) effects++; + if (tags.hasKey("Effect2")) effects++; + if (tags.hasKey("Effect3")) effects++; + if (tags.hasKey("Effect4")) effects++; + if (tags.hasKey("Effect5")) effects++; + if (tags.hasKey("Effect6")) effects++; data.writeInt(effects); - switch (effects) - { - case 6: - data.writeInt(tags.getInteger("Effect6")); - case 5: - data.writeInt(tags.getInteger("Effect5")); - case 4: - data.writeInt(tags.getInteger("Effect4")); - case 3: - data.writeInt(tags.getInteger("Effect3")); - case 2: - data.writeInt(tags.getInteger("Effect2")); - case 1: - data.writeInt(tags.getInteger("Effect1")); + switch (effects) { + case 6: + data.writeInt(tags.getInteger("Effect6")); + case 5: + data.writeInt(tags.getInteger("Effect5")); + case 4: + data.writeInt(tags.getInteger("Effect4")); + case 3: + data.writeInt(tags.getInteger("Effect3")); + case 2: + data.writeInt(tags.getInteger("Effect2")); + case 1: + data.writeInt(tags.getInteger("Effect1")); } } @Override - public void readSpawnData (ByteBuf data) - { + public void readSpawnData(ByteBuf data) { returnStack = ByteBufUtils.readItemStack(data); rotationYaw = data.readFloat(); NBTTagCompound compound = new NBTTagCompound(); @@ -445,20 +400,19 @@ public void readSpawnData (ByteBuf data) toolTag.setInteger("RenderAccessory", data.readInt()); toolTag.setInteger("RenderExtra", data.readInt()); - switch (data.readInt()) - { - case 6: - toolTag.setInteger("Effect6", data.readInt()); - case 5: - toolTag.setInteger("Effect5", data.readInt()); - case 4: - toolTag.setInteger("Effect4", data.readInt()); - case 3: - toolTag.setInteger("Effect3", data.readInt()); - case 2: - toolTag.setInteger("Effect2", data.readInt()); - case 1: - toolTag.setInteger("Effect1", data.readInt()); + switch (data.readInt()) { + case 6: + toolTag.setInteger("Effect6", data.readInt()); + case 5: + toolTag.setInteger("Effect5", data.readInt()); + case 4: + toolTag.setInteger("Effect4", data.readInt()); + case 3: + toolTag.setInteger("Effect3", data.readInt()); + case 2: + toolTag.setInteger("Effect2", data.readInt()); + case 1: + toolTag.setInteger("Effect1", data.readInt()); } compound.setTag("InfiTool", toolTag); returnStack.setTagCompound(compound); diff --git a/src/main/java/tconstruct/tools/gui/BattlesignGui.java b/src/main/java/tconstruct/tools/gui/BattlesignGui.java index 38d06585699..a8f00042054 100644 --- a/src/main/java/tconstruct/tools/gui/BattlesignGui.java +++ b/src/main/java/tconstruct/tools/gui/BattlesignGui.java @@ -12,28 +12,24 @@ import tconstruct.tools.logic.BattlesignLogic; import tconstruct.util.network.SignDataPacket; -public class BattlesignGui extends GuiScreen -{ +public class BattlesignGui extends GuiScreen { private BattlesignLogic battlesign; private float bgColR = 1F; private float bgColG = 1F; private float bgColB = 1F; private static ResourceLocation background = new ResourceLocation("tinker:textures/gui/battlesignText.png"); - private String[] text = { "", "", "", "", "" }; + private String[] text = {"", "", "", "", ""}; int currentLine = 0; - public BattlesignGui(BattlesignLogic logic) - { + public BattlesignGui(BattlesignLogic logic) { this.battlesign = logic; ItemStack stack = logic.getEquipmentItem(); - if (stack != null) - { + if (stack != null) { NBTTagCompound tag = stack.getTagCompound().getCompoundTag("InfiTool"); - if (tag != null) - { + if (tag != null) { int head = tag.getInteger("Head"); int bgCol = TConstructRegistry.getMaterial(head).primaryColor(); @@ -46,8 +42,7 @@ public BattlesignGui(BattlesignLogic logic) } @Override - public void initGui () - { + public void initGui() { buttonList.clear(); super.initGui(); @@ -61,8 +56,7 @@ public void initGui () } @Override - public void drawScreen (int mouseX, int mouseY, float something) - { + public void drawScreen(int mouseX, int mouseY, float something) { Tessellator t = Tessellator.instance; GL11.glColor4f(bgColR, bgColG, bgColB, 1F); @@ -77,100 +71,103 @@ public void drawScreen (int mouseX, int mouseY, float something) GL11.glPushMatrix(); float lum = calcLuminance(bgColR, bgColG, bgColB); - for (int i = 0; i < text.length; i++) - { - fontRendererObj.drawString((lum >= 35F ? EnumChatFormatting.BLACK : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + (i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " \u00A7r" + (lum >= 35F ? EnumChatFormatting.BLACK : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + "<" : ""), k - fontRendererObj.getStringWidth((i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " <" : "")) / 2 + 51, l + 4 + 10 * i, 0); + for (int i = 0; i < text.length; i++) { + fontRendererObj.drawString( + (lum >= 35F + ? EnumChatFormatting.BLACK + : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + + (i == currentLine ? "> " : "") + + text[i] + + (i == currentLine + ? " \u00A7r" + + (lum >= 35F + ? EnumChatFormatting.BLACK + : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + + "<" + : ""), + k + - fontRendererObj.getStringWidth( + (i == currentLine ? "> " : "") + text[i] + (i == currentLine ? " <" : "")) + / 2 + + 51, + l + 4 + 10 * i, + 0); } GL11.glPopMatrix(); } @Override - protected void keyTyped (char c, int i) - { + protected void keyTyped(char c, int i) { super.keyTyped(c, i); - if (fontRendererObj.getStringWidth(text[currentLine]) < 90 && ChatAllowedCharacters.isAllowedCharacter(c)) - { - if (Keyboard.isKeyDown(56) && c == 'f' && (text[currentLine].length() == 0 || text[currentLine].charAt(text[currentLine].length() - 1) != '\u00A7')) - { + if (fontRendererObj.getStringWidth(text[currentLine]) < 90 && ChatAllowedCharacters.isAllowedCharacter(c)) { + if (Keyboard.isKeyDown(56) + && c == 'f' + && (text[currentLine].length() == 0 + || text[currentLine].charAt(text[currentLine].length() - 1) != '\u00A7')) { text[currentLine] += "\u00A7"; - } - else - { + } else { text[currentLine] += c; } - } - else - { - switch (i) - { - case 14: - if (text[currentLine].length() > 0) - { - text[currentLine] = text[currentLine].substring(0, text[currentLine].length() - 1); - } - - break; - case 28: - moveLine(1); - break; - case 200: - moveLine(-1); - break; - case 208: - moveLine(1); - break; + } else { + switch (i) { + case 14: + if (text[currentLine].length() > 0) { + text[currentLine] = text[currentLine].substring(0, text[currentLine].length() - 1); + } + + break; + case 28: + moveLine(1); + break; + case 200: + moveLine(-1); + break; + case 208: + moveLine(1); + break; } } } - private void moveLine (int i) - { - if (i < 0) - { - if (currentLine <= 0) - { + private void moveLine(int i) { + if (i < 0) { + if (currentLine <= 0) { currentLine = text.length - 1; - } - else - { + } else { currentLine--; } - } - else - { - if (currentLine >= text.length - 1) - { + } else { + if (currentLine >= text.length - 1) { currentLine = 0; - } - else - { + } else { currentLine++; } } } @Override - public void onGuiClosed () - { + public void onGuiClosed() { super.onGuiClosed(); Keyboard.enableRepeatEvents(false); - TConstruct.packetPipeline.sendToServer(new SignDataPacket(battlesign.getWorldObj().provider.dimensionId, battlesign.xCoord, battlesign.yCoord, battlesign.zCoord, text)); + TConstruct.packetPipeline.sendToServer(new SignDataPacket( + battlesign.getWorldObj().provider.dimensionId, + battlesign.xCoord, + battlesign.yCoord, + battlesign.zCoord, + text)); } - private float calcLuminance (float r, float g, float b) - { + private float calcLuminance(float r, float g, float b) { return (r * 255 * 0.299f + g * 255 * 0.587f + b * 255 * 0.114f) / 3; } @Override - protected void actionPerformed (GuiButton button) - { - if (button.id == 0) - { + protected void actionPerformed(GuiButton button) { + if (button.id == 0) { this.mc.displayGuiScreen((GuiScreen) null); this.mc.setIngameFocus(); } diff --git a/src/main/java/tconstruct/tools/gui/ChestSlot.java b/src/main/java/tconstruct/tools/gui/ChestSlot.java index eec0abc7578..84716f0b43e 100644 --- a/src/main/java/tconstruct/tools/gui/ChestSlot.java +++ b/src/main/java/tconstruct/tools/gui/ChestSlot.java @@ -24,7 +24,7 @@ public ChestSlot(IInventory inventory, int index, int visualIndex, int xPosition @SideOnly(Side.CLIENT) @Override - public boolean func_111238_b/*isEnabled*/() { + public boolean func_111238_b /*isEnabled*/() { return enabled; } @@ -57,4 +57,10 @@ public boolean canTakeStack(EntityPlayer player) { } return super.canTakeStack(player); } + + @Override + public ItemStack getStack() { + ItemStack stack = super.getStack(); + return (stack != null && stack.stackSize > 0) ? stack : null; + } } diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index 0d37317bd38..7763ee0ccb7 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -4,6 +4,9 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import java.awt.Rectangle; +import java.util.Collections; +import java.util.List; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -22,17 +25,13 @@ import tconstruct.library.util.HarvestLevels; import tconstruct.tools.logic.CraftingStationLogic; -import java.awt.Rectangle; -import java.util.Collections; -import java.util.List; - @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { /* * Slider/slots related. Taken & adapted from Tinkers Construct 1.12 under the MIT License */ private static final ResourceLocation gui_inventory = new ResourceLocation("tinker", "textures/gui/generic.png"); - + public static final GuiElementScalable slotElement = new GuiElementScalable(7, 7, 18, 18, 64, 64); public static final GuiElementScalable slotEmptyElement = new GuiElementScalable(7 + 18, 7, 18, 18, 64, 64); @@ -44,7 +43,8 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { private static final GuiElementScalable sliderBackground = new GuiElementScalable(43, 8, 12, 30, 64, 64); private static final GuiElementScalable textBackground = new GuiElementScalable(7 + 18, 7, 18, 10, 64, 64); - private final GuiSliderWidget slider = new GuiSliderWidget(sliderNormal, sliderHigh, sliderLow, sliderTop, sliderBottom, sliderBackground); + private final GuiSliderWidget slider = + new GuiSliderWidget(sliderNormal, sliderHigh, sliderLow, sliderTop, sliderBottom, sliderBackground); private final GuiBorderWidget border = new GuiBorderWidget(); private int firstSlotId; @@ -52,7 +52,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { private int chestSlotCount; /* end slider/slots */ - + private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/tinkertable.png"); private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); private static final ResourceLocation icons = new ResourceLocation("tinker", "textures/gui/icons.png"); @@ -64,19 +64,19 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { public GuiTextField text; public String title, body = ""; CraftingStationLogic logic; - + private int craftingLeft = 0; private int craftingTop = 0; private int craftingTextLeft = 0; private int descLeft = 0; private int descTop = 0; private int descTextLeft = 0; - + private int chestLeft = 0; private int chestTop = 0; private int chestWidth = 0; private int chestHeight = 0; - + public CraftingStationGui(InventoryPlayer inventory, CraftingStationLogic logic, World world, int x, int y, int z) { super(logic.getGuiContainer(inventory, world, x, y, z)); this.logic = logic; @@ -119,43 +119,52 @@ protected void drawGuiContainerForegroundLayer(int par1, int par2) { if (logic.chest != null) { if (logic.chest.get() instanceof TileEntity) { TileEntity te = (TileEntity) logic.chest.get(); - if (te == null || te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) == null && te.getWorldObj().isRemote) { + if (te == null + || te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) == null + && te.getWorldObj().isRemote) { mc.thePlayer.closeScreen(); return; } } - this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.chest.get().getInventoryName()), 8, 6, 0x202020); + this.fontRendererObj.drawString( + StatCollector.translateToLocal(logic.chest.get().getInventoryName()), 8, 6, 0x202020); } - this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), craftingTextLeft + 8, 6, 0x202020); - this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), craftingTextLeft + 8, 72, 0x202020); + this.fontRendererObj.drawString( + StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), + craftingTextLeft + 8, + 6, + 0x202020); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), craftingTextLeft + 8, 72, 0x202020); if (logic.tinkerTable) { if (logic.isStackInSlot(0)) // output slot = modified item - drawToolStats(logic.getStackInSlot(0)); + drawToolStats(logic.getStackInSlot(0)); else if (logic.isStackInSlot(5)) { // center slot if no output item // other slots empty? - if (!logic.isStackInSlot(1) && !logic.isStackInSlot(2) && !logic.isStackInSlot(3) && !logic.isStackInSlot(4) - && !logic.isStackInSlot(6) && !logic.isStackInSlot(7) && !logic.isStackInSlot(8) && !logic.isStackInSlot(9)) - drawToolStats(logic.getStackInSlot(5)); - else - drawToolInformation(); - } else - drawToolInformation(); + if (!logic.isStackInSlot(1) + && !logic.isStackInSlot(2) + && !logic.isStackInSlot(3) + && !logic.isStackInSlot(4) + && !logic.isStackInSlot(6) + && !logic.isStackInSlot(7) + && !logic.isStackInSlot(8) + && !logic.isStackInSlot(9)) drawToolStats(logic.getStackInSlot(5)); + else drawToolInformation(); + } else drawToolInformation(); } } void drawToolStats(ItemStack stack) { - if (stack.getItem() instanceof IModifyable) - ToolStationGuiHelper.drawToolStats(stack, descTextLeft + 10, 0); + if (stack.getItem() instanceof IModifyable) ToolStationGuiHelper.drawToolStats(stack, descTextLeft + 10, 0); int matID = PatternBuilder.instance.getPartID(stack); if (matID != Short.MAX_VALUE && matID > 0) { ToolMaterial material = TConstructRegistry.getMaterial(matID); - if (material != null) - drawMaterialStats(material); + if (material != null) drawMaterialStats(material); } } @@ -174,17 +183,44 @@ protected void drawMaterialStats(ToolMaterial materialEnum) { drawCenteredString(this.fontRendererObj, centerTitle, baseX + 55, baseY, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter4") + materialEnum.durability(), baseX, baseY + 16, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter5") + materialEnum.handleDurability() + "x", baseX, baseY + 27, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter6") + materialEnum.toolSpeed() / 100f, baseX, baseY + 38, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter7") + HarvestLevels.getHarvestLevelName(materialEnum.harvestLevel()), baseX, baseY + 49, 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter4") + materialEnum.durability(), + baseX, + baseY + 16, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter5") + materialEnum.handleDurability() + "x", + baseX, + baseY + 27, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter6") + materialEnum.toolSpeed() / 100f, + baseX, + baseY + 38, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter7") + + HarvestLevels.getHarvestLevelName(materialEnum.harvestLevel()), + baseX, + baseY + 49, + 16777215); int attack = materialEnum.attack(); - String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); + String heart = attack == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, baseX, baseY + 60, 0xffffff); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, + baseX, + baseY + 60, + 0xffffff); else - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, baseX, baseY + 60, 0xffffff); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, + baseX, + baseY + 60, + 0xffffff); } @Override @@ -207,9 +243,8 @@ protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, i GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(gui_inventory); - if(hasChest()) { + if (hasChest()) { chestLeft += border.w; chestTop += border.h; @@ -243,7 +278,6 @@ protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, i this.mc.getTextureManager().bindTexture(description); this.drawTexturedModalRect(this.descLeft, this.descTop, 0, 0, 126, 172); } - } @Override @@ -275,19 +309,19 @@ public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemSta @Override public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { final int cw = (logic.chest != null ? chestWidth : 0); - if(logic.chest != null) { + if (logic.chest != null) { final Rectangle blah = new Rectangle(x, y, w, h); final Rectangle chestRectangle = new Rectangle( - chestLeft, chestTop, chestWidth, chestHeight + (shouldDrawName() ? textBackground.y : 0) + (border.h * 2) - ); - - if(chestRectangle.intersects(blah)) - return true; + chestLeft, + chestTop, + chestWidth, + chestHeight + (shouldDrawName() ? textBackground.y : 0) + (border.h * 2)); + + if (chestRectangle.intersects(blah)) return true; } - - if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) - return false; - + + if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) return false; + return x - w - 4 >= guiLeft + cw && x + 4 <= guiLeft + xSize + cw + (logic.tinkerTable ? 126 : 0); } @@ -298,14 +332,16 @@ public boolean hasChest() { public boolean isMouseInChest(int mouseX, int mouseY) { final int xMod = (slider.isEnabled() ? slider.width : 0) + border.w; final int yMod = (shouldDrawName() ? textBackground.y : 0) + (border.h * 2); - - return mouseX >= (this.chestLeft - xMod) && mouseX < (chestLeft + chestWidth + xMod) && - mouseY >= (this.chestTop - yMod) && mouseY < (chestTop + chestHeight + yMod); + + return mouseX >= (this.chestLeft - xMod) + && mouseX < (chestLeft + chestWidth + xMod) + && mouseY >= (this.chestTop - yMod) + && mouseY < (chestTop + chestHeight + yMod); } public boolean isMouseOverFullSlot(int mouseX, int mouseY) { - for(final Object slot : inventorySlots.inventorySlots) { - if(isMouseOverSlot((Slot)slot, mouseX, mouseY) && ((Slot)slot).getHasStack()) { + for (final Object slot : inventorySlots.inventorySlots) { + if (isMouseOverSlot((Slot) slot, mouseX, mouseY) && ((Slot) slot).getHasStack()) { return true; } } @@ -313,22 +349,24 @@ public boolean isMouseOverFullSlot(int mouseX, int mouseY) { } protected boolean shouldDrawName() { - return this.logic.chest != null && this.logic.chest.get().getInventoryName() != null && !this.logic.chest.get().getInventoryName().isEmpty(); + return this.logic.chest != null + && this.logic.chest.get().getInventoryName() != null + && !this.logic.chest.get().getInventoryName().isEmpty(); } - + @Override - public void func_146977_a/*drawSlot*/(Slot slot) { - if(!slot.func_111238_b/*isEnabled*/()) return; - + public void func_146977_a /*drawSlot*/(Slot slot) { + if (!slot.func_111238_b /*isEnabled*/()) return; + super.func_146977_a(slot); } - + public boolean shouldDrawSlot(Slot slot) { - if(!(slot instanceof ChestSlot)) return true; + if (!(slot instanceof ChestSlot)) return true; ChestSlot chestSlot = (ChestSlot) slot; // all visible - if(!slider.isEnabled()) return true; + if (!slider.isEnabled()) return true; return firstSlotId <= chestSlot.getVisualIndex() && lastSlotId > chestSlot.getVisualIndex(); } @@ -337,7 +375,7 @@ public boolean shouldDrawSlot(Slot slot) { public boolean isMouseOverSlot(Slot slotIn, int mouseX, int mouseY) { return super.isMouseOverSlot(slotIn, mouseX, mouseY) && shouldDrawSlot(slotIn); } - + private int getDisplayedRows() { return chestHeight / slotElement.h; } @@ -346,7 +384,7 @@ private int calcCappedYSize(int max) { int h = slotElement.h * logic.invRows; // not higher than the max - while(h > max) { + while (h > max) { h -= slotElement.h; } return h; @@ -362,28 +400,32 @@ public void updateChest() { chestSlotCount = logic.slotCount; // slider needed? - if(getDisplayedRows() < logic.invRows) { + if (getDisplayedRows() < logic.invRows) { slider.enable(); - } - else { + } else { slider.disable(); } - chestWidth = logic.invColumns * CraftingStationGui.slotElement.w + 2 * border.w + (slider.isEnabled() ? slider.width : 0); + chestWidth = logic.invColumns * CraftingStationGui.slotElement.w + + 2 * border.w + + (slider.isEnabled() ? slider.width : 0); chestLeft = guiLeft - chestWidth; chestTop = guiTop; - // Leaving out the xSize increase by chestSize and adjusting where it's used, because otherwise it shifts both the bookmarks and item panel + // Leaving out the xSize increase by chestSize and adjusting where it's used, because otherwise it shifts both + // the bookmarks and item panel // way too far out. If anything (mouseClick, for example) relies on xSize, you'll need to hack it like below. -// xSize += guiLeft - chestLeft; + // xSize += guiLeft - chestLeft; guiLeft = chestLeft; border.setPosition(chestLeft, chestTop); border.setSize(chestWidth, chestHeight + (shouldDrawName() ? textBackground.h : 0) + 2 * border.h); slider.show(); - slider.setPosition(chestLeft + logic.invColumns * slotElement.w + border.w, chestTop + (shouldDrawName() ? textBackground.h : 0) + border.h); + slider.setPosition( + chestLeft + logic.invColumns * slotElement.w + border.w, + chestTop + (shouldDrawName() ? textBackground.h : 0) + border.h); slider.setSize(chestHeight); slider.setSliderParameters(0, logic.invRows - getDisplayedRows(), 1); @@ -393,7 +435,7 @@ public void updateChest() { @Override protected void mouseClicked(int x, int y, int button) { // Hacks - final int height = ySize; + final int height = ySize; if (logic.chest != null && x >= guiLeft && x <= guiLeft + chestWidth) { ySize = border.height; @@ -404,11 +446,11 @@ protected void mouseClicked(int x, int y, int button) { xSize -= chestWidth; ySize = height; } - + @Override protected void mouseMovedOrUp(int x, int y, int button) { // Hacks - final int height = ySize; + final int height = ySize; if (logic.chest != null && x >= guiLeft && x <= guiLeft + chestWidth) { ySize = border.height; @@ -419,29 +461,29 @@ protected void mouseMovedOrUp(int x, int y, int button) { xSize -= chestWidth; ySize = height; } - + // updates slot visibility protected void updateChestSlots() { - if(!hasChest()) return; - + if (!hasChest()) return; + final IInventory secondInventory = logic.getSecondInventory(); - + int xOffset = border.w; int yOffset = border.h; - - if(shouldDrawName()) { + + if (shouldDrawName()) { yOffset += textBackground.h; } - + firstSlotId = slider.getValue() * logic.invColumns; lastSlotId = Math.min(chestSlotCount, firstSlotId + getDisplayedRows() * logic.invColumns); - - for(Object o : inventorySlots.inventorySlots) { - if(!(o instanceof ChestSlot)) continue; - - final ChestSlot slot = (ChestSlot)o; - - if(shouldDrawSlot(slot)) { + + for (Object o : inventorySlots.inventorySlots) { + if (!(o instanceof ChestSlot)) continue; + + final ChestSlot slot = (ChestSlot) o; + + if (shouldDrawSlot(slot)) { slot.enable(); // calc position of the slot final int offset = slot.getVisualIndex() - firstSlotId; @@ -450,39 +492,36 @@ protected void updateChestSlots() { slot.xDisplayPosition = x + xOffset + 1 /*- this.chestWidth*/; slot.yDisplayPosition = y + yOffset + 1; - } - else { + } else { slot.disable(); slot.xDisplayPosition = 0; slot.yDisplayPosition = 0; } } } - // drawSlots protected void drawChestSlots(int xPos, int yPos) { - if(!hasChest()) return; - + if (!hasChest()) return; + int width = logic.invColumns * slotElement.w; int height = chestHeight - border.h * 2; int fullRows = (lastSlotId - firstSlotId) / logic.invColumns; int slotsLeft = (lastSlotId - firstSlotId) % logic.invColumns; - + int y; // We use it after the loop - for(y = 0; y < fullRows * slotElement.h && y < height; y += slotElement.h) { + for (y = 0; y < fullRows * slotElement.h && y < height; y += slotElement.h) { slotElement.drawScaledX(xPos, yPos + y, width); } // draw partial row and unused slots - if(slotsLeft > 0) { + if (slotsLeft > 0) { slotElement.drawScaledX(xPos, yPos + y, slotsLeft * slotElement.w); // empty slots that don't exist slotEmptyElement.drawScaledX(xPos + slotsLeft * slotElement.w, yPos + y, width - slotsLeft * slotElement.w); } } - /* * Hide the deprecated stuff at the bottom diff --git a/src/main/java/tconstruct/tools/gui/FrypanGui.java b/src/main/java/tconstruct/tools/gui/FrypanGui.java index 687ecf6d80f..7273768eba6 100644 --- a/src/main/java/tconstruct/tools/gui/FrypanGui.java +++ b/src/main/java/tconstruct/tools/gui/FrypanGui.java @@ -7,35 +7,31 @@ import org.lwjgl.opengl.GL11; import tconstruct.tools.logic.FrypanLogic; -public class FrypanGui extends GuiContainer -{ +public class FrypanGui extends GuiContainer { public FrypanLogic logic; - public FrypanGui(InventoryPlayer inventoryplayer, FrypanLogic frypan, World world, int x, int y, int z) - { + public FrypanGui(InventoryPlayer inventoryplayer, FrypanLogic frypan, World world, int x, int y, int z) { super(frypan.getGuiContainer(inventoryplayer, world, x, y, z)); logic = frypan; } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png"); @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); - if (logic.fuel > 0) - { + if (logic.fuel > 0) { int fuel = logic.gaugeFuelScaled(12); drawTexturedModalRect(cornerX + 27, (cornerY + 40) - fuel, 176, 12 - fuel, 14, fuel + 2); } diff --git a/src/main/java/tconstruct/tools/gui/FurnaceGui.java b/src/main/java/tconstruct/tools/gui/FurnaceGui.java index bf7e0efc4ae..b9d6a857fb8 100644 --- a/src/main/java/tconstruct/tools/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/tools/gui/FurnaceGui.java @@ -10,13 +10,12 @@ import tconstruct.tools.logic.FurnaceLogic; @SideOnly(Side.CLIENT) -public class FurnaceGui extends GuiContainer -{ - private static final ResourceLocation furnaceGuiTextures = new ResourceLocation("textures/gui/container/furnace.png"); +public class FurnaceGui extends GuiContainer { + private static final ResourceLocation furnaceGuiTextures = + new ResourceLocation("textures/gui/container/furnace.png"); private FurnaceLogic logic; - public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) - { + public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) { super(new FurnaceContainer(inventory, furnace)); this.logic = furnace; } @@ -26,8 +25,7 @@ public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) * the items) */ @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.format(this.logic.getInvName()); this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); @@ -38,8 +36,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) * items) */ @Override - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) - { + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(furnaceGuiTextures); int k = (this.width - this.xSize) / 2; @@ -47,8 +44,7 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int i1; - if (this.logic.isBurning()) - { + if (this.logic.isBurning()) { i1 = this.logic.gaugeFuelScaled(12); this.drawTexturedModalRect(k + 56, l + 36 + 12 - i1, 176, 12 - i1, 14, i1 + 2); } diff --git a/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java b/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java index 19d212c0ea2..0d555477c9c 100644 --- a/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java +++ b/src/main/java/tconstruct/tools/gui/GuiBorderWidget.java @@ -1,20 +1,20 @@ package tconstruct.tools.gui; /* - * Taken from Tinker's Construct 1.12 under the MIT License - * - * The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* Taken from Tinker's Construct 1.12 under the MIT License +* +* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) +* +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +*/ public class GuiBorderWidget { // all elements based on generic gui @@ -44,7 +44,7 @@ public void setSize(int width, int height) { this.width = width; this.height = height; } - + /** Sets the size so that the given point is the upper left corner of the inside */ public void setPosInner(int x, int y) { setPosition(x - cornerTopLeft.w, y - cornerTopLeft.h); diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java b/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java index eadf1915afe..5a9df1b58bd 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java @@ -6,20 +6,20 @@ import org.lwjgl.opengl.GL11; import tconstruct.library.client.StencilGuiElement; -public class GuiButtonStencil extends GuiButton -{ +public class GuiButtonStencil extends GuiButton { /** * True for pointing right (next page), false for pointing left (previous * page). */ int textureX; + int textureY; public String texture; public StencilGuiElement element; private static ResourceLocation background; - public GuiButtonStencil(int id, int posX, int posY, int texX, int texY, String domain, String tex, StencilGuiElement e) - { + public GuiButtonStencil( + int id, int posX, int posY, int texX, int texY, String domain, String tex, StencilGuiElement e) { super(id, posX, posY, 18, 18, ""); textureX = texX; textureY = texY; @@ -32,15 +32,19 @@ public GuiButtonStencil(int id, int posX, int posY, int texX, int texY, String d * Draws this button to the screen. */ @Override - public void drawButton (Minecraft mc, int mouseX, int mouseY) - { - if (this.visible) - { - boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + if (this.visible) { + boolean var4 = mouseX >= this.xPosition + && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(background); - this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; + this.field_146123_n = mouseX >= this.xPosition + && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_146123_n); int index = 18 * getHoverState(field_146123_n); this.drawTexturedModalRect(this.xPosition, this.yPosition, 144 + index * 2, 234, 18, 18); diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index 2c02f6e974f..9d65cbb9464 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -8,22 +8,21 @@ import tconstruct.library.client.ToolGuiElement; @SideOnly(Side.CLIENT) -public class GuiButtonTool extends GuiButton -{ +public class GuiButtonTool extends GuiButton { /** * True for pointing right (next page), false for pointing left (previous * page). */ int textureX; + int textureY; public String texture; public ToolGuiElement element; - private ResourceLocation background;// = new - // ResourceLocation("tinker", - // "textures/gui/armorextended.png"); + private ResourceLocation background; // = new + // ResourceLocation("tinker", + // "textures/gui/armorextended.png"); - public GuiButtonTool(int id, int posX, int posY, int texX, int texY, String domain, String tex, ToolGuiElement e) - { + public GuiButtonTool(int id, int posX, int posY, int texX, int texY, String domain, String tex, ToolGuiElement e) { super(id, posX, posY, 18, 18, ""); textureX = texX; textureY = texY; @@ -36,15 +35,19 @@ public GuiButtonTool(int id, int posX, int posY, int texX, int texY, String doma * Draws this button to the screen. */ @Override - public void drawButton (Minecraft mc, int mouseX, int mouseY) - { - if (this.visible) - { - boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + if (this.visible) { + boolean var4 = mouseX >= this.xPosition + && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(background); - this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; + this.field_146123_n = mouseX >= this.xPosition + && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_146123_n); int index = 18 * getHoverState(field_146123_n); this.drawTexturedModalRect(this.xPosition, this.yPosition, 144 + index * 2, 216, 18, 18); diff --git a/src/main/java/tconstruct/tools/gui/GuiElementDuex.java b/src/main/java/tconstruct/tools/gui/GuiElementDuex.java index 09021e37496..0ebcea81d82 100644 --- a/src/main/java/tconstruct/tools/gui/GuiElementDuex.java +++ b/src/main/java/tconstruct/tools/gui/GuiElementDuex.java @@ -5,20 +5,20 @@ import net.minecraft.client.gui.GuiScreen; /* - * Taken from Mantle 1.12-1.3.3.49 under the MIT License - * - * The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - */ +* Taken from Mantle 1.12-1.3.3.49 under the MIT License +* +* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) +* +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ @SideOnly(Side.CLIENT) public class GuiElementDuex { @@ -88,4 +88,4 @@ public GuiElementDuex get(int x, int y, int w, int h) { return new GuiElementDuex(x, y, w, h, this.w, this.h); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/gui/GuiElementScalable.java b/src/main/java/tconstruct/tools/gui/GuiElementScalable.java index 94e68058cb7..7ed79940546 100644 --- a/src/main/java/tconstruct/tools/gui/GuiElementScalable.java +++ b/src/main/java/tconstruct/tools/gui/GuiElementScalable.java @@ -5,20 +5,20 @@ import net.minecraft.client.gui.GuiScreen; /* - * Taken from Mantle 1.12-1.3.3.49 under the MIT License - * - * The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* Taken from Mantle 1.12-1.3.3.49 under the MIT License +* +* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) +* +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +*/ @SideOnly(Side.CLIENT) public class GuiElementScalable extends GuiElementDuex { @@ -32,12 +32,12 @@ public GuiElementScalable(int x, int y, int w, int h) { } public int drawScaledX(int xPos, int yPos, int width) { - for(int i = 0; i < width / w; i++) { + for (int i = 0; i < width / w; i++) { draw(xPos + i * w, yPos); } // remainder that doesn't fit total width int remainder = width % w; - if(remainder > 0) { + if (remainder > 0) { GuiScreen.func_146110_a(xPos + width - remainder, yPos, x, y, remainder, h, texW, texH); } @@ -45,12 +45,12 @@ public int drawScaledX(int xPos, int yPos, int width) { } public int drawScaledY(int xPos, int yPos, int height) { - for(int i = 0; i < height / h; i++) { + for (int i = 0; i < height / h; i++) { draw(xPos, yPos + i * h); } // remainder that doesn't fit total width int remainder = height % h; - if(remainder > 0) { + if (remainder > 0) { // drawModalRectWithCustomSizedTexture GuiScreen.func_146110_a(xPos, yPos + height - remainder, x, y, w, remainder, texW, texH); } @@ -61,7 +61,7 @@ public int drawScaledY(int xPos, int yPos, int height) { public int drawScaled(int xPos, int yPos, int width, int height) { // we draw full height row-wise int full = height / this.h; - for(int i = 0; i < full; i++) { + for (int i = 0; i < full; i++) { drawScaledX(xPos, yPos + i * this.h, width); } @@ -70,12 +70,12 @@ public int drawScaled(int xPos, int yPos, int width, int height) { // and the remainder is drawn manually int yRest = height % this.h; // the same as drawScaledX but with the remaining height - for(int i = 0; i < width / w; i++) { + for (int i = 0; i < width / w; i++) { drawScaledY(xPos + i * w, yPos, yRest); } // remainder that doesn't fit total width int remainder = width % w; - if(remainder > 0) { + if (remainder > 0) { // drawModalRectWithCustomSizedTexture GuiScreen.func_146110_a(xPos + width - remainder, yPos, x, y, remainder, yRest, texW, texH); } @@ -89,4 +89,4 @@ public GuiElementScalable shift(int xd, int yd) { element.setTextureSize(texW, texH); return element; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java b/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java index 54d12b4fbe4..d9a8a0297d8 100644 --- a/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java +++ b/src/main/java/tconstruct/tools/gui/GuiSliderWidget.java @@ -5,20 +5,20 @@ import org.lwjgl.input.Mouse; /* - * Taken from Mantle 1.12-1.3.3.49 under the MIT License - * - * The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - */ +* Taken from Mantle 1.12-1.3.3.49 under the MIT License +* +* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) +* +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ // a vertical slider! @SideOnly(Side.CLIENT) @@ -51,7 +51,13 @@ public class GuiSliderWidget { private int clickY; private boolean clickedBar; // if the bar has already been clicked and not released - public GuiSliderWidget(GuiElementDuex slider, GuiElementDuex sliderHighlighted, GuiElementDuex sliderDisabled, GuiElementDuex slideBarTop, GuiElementDuex slideBarBottom, GuiElementScalable slideBar) { + public GuiSliderWidget( + GuiElementDuex slider, + GuiElementDuex sliderHighlighted, + GuiElementDuex sliderDisabled, + GuiElementDuex slideBarTop, + GuiElementDuex slideBarBottom, + GuiElementScalable slideBar) { this.slider = slider; this.sliderHighlighted = sliderHighlighted; this.sliderDisabled = sliderDisabled; @@ -244,8 +250,7 @@ else if (isScrolling) { } } // not scrolling yet but possibly inside the slider - else if (x >= 0 && y >= getSliderTop() && - x - sliderOffset <= slider.w && y <= getSliderTop() + slider.h) { + else if (x >= 0 && y >= getSliderTop() && x - sliderOffset <= slider.w && y <= getSliderTop() + slider.h) { isHighlighted = true; if (mouseDown) { isScrolling = true; @@ -254,9 +259,7 @@ else if (x >= 0 && y >= getSliderTop() && } } // not on the slider but clicked on the bar - else if (mouseDown && !clickedBar && - x >= 0 && y >= 0 && - x <= slideBar.w && y <= height) { + else if (mouseDown && !clickedBar && x >= 0 && y >= 0 && x <= slideBar.w && y <= height) { if (y < getSliderTop()) { decrement(); } else { @@ -278,4 +281,4 @@ public int increment() { setSliderValue(currentValue + increment); return currentValue; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 501003b870c..d1c3352a0aa 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -4,6 +4,8 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import java.util.Collections; +import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -19,12 +21,8 @@ import tconstruct.tools.inventory.PartCrafterChestContainer; import tconstruct.tools.logic.PartBuilderLogic; -import java.util.Collections; -import java.util.List; - @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") -public class PartCrafterGui extends GuiContainer implements INEIGuiHandler -{ +public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { PartBuilderLogic logic; String title, otherTitle = ""; boolean drawChestPart; @@ -52,8 +50,8 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler private int chestLeft = 0; private int chestTop = 0; - public PartCrafterGui(InventoryPlayer inventoryplayer, PartBuilderLogic partlogic, World world, int x, int y, int z) - { + public PartCrafterGui( + InventoryPlayer inventoryplayer, PartBuilderLogic partlogic, World world, int x, int y, int z) { super((ActiveContainer) partlogic.getGuiContainer(inventoryplayer, world, x, y, z)); logic = partlogic; drawChestPart = inventorySlots instanceof PartCrafterChestContainer; @@ -62,8 +60,7 @@ public PartCrafterGui(InventoryPlayer inventoryplayer, PartBuilderLogic partlogi } @Override - public void initGui () - { + public void initGui() { super.initGui(); this.xSize = CRAFT_WIDTH; @@ -78,120 +75,166 @@ public void initGui () this.descLeft = this.craftingLeft + CRAFT_WIDTH; this.descTop = this.craftingTop; - if (drawChestPart) - { + if (drawChestPart) { this.xSize += CHEST_WIDTH - 6; this.guiLeft -= CHEST_WIDTH - 6; - + this.chestLeft = this.guiLeft; this.chestTop = this.guiTop + 11; } - + this.craftingTextLeft = this.craftingLeft - this.guiLeft; this.descTextLeft = this.descLeft - this.guiLeft; } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { - if (drawChestPart) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + if (drawChestPart) { this.fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 14, 17, 4210752); } - this.fontRendererObj.drawString(StatCollector.translateToLocal("crafters.PartBuilder"), craftingTextLeft + 6, 6, 4210752); - this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), craftingTextLeft + 8, this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("crafters.PartBuilder"), craftingTextLeft + 6, 6, 4210752); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), + craftingTextLeft + 8, + this.ySize - 96 + 2, + 4210752); drawMaterialInformation(); } - void drawDefaultInformation () - { + void drawDefaultInformation() { title = "\u00A7n" + StatCollector.translateToLocal("gui.partcrafter2"); this.drawCenteredString(fontRendererObj, title, descTextLeft + DESC_WIDTH / 2, 8, 16777215); - fontRendererObj.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), descTextLeft + 8, 24, 115, 16777215); + fontRendererObj.drawSplitString( + StatCollector.translateToLocal("gui.partcrafter3"), descTextLeft + 8, 24, 115, 16777215); } - void drawMaterialInformation () - { + void drawMaterialInformation() { ItemStack top = logic.getStackInSlot(2); - //ItemStack topResult = logic.getStackInSlot(4); + // ItemStack topResult = logic.getStackInSlot(4); ItemStack bottom = logic.getStackInSlot(3); - //ItemStack bottomResult = logic.getStackInSlot(6); - if (topMaterial != top) - { + // ItemStack bottomResult = logic.getStackInSlot(6); + if (topMaterial != top) { topMaterial = top; int topID = PatternBuilder.instance.getPartID(top); - if (topID != Short.MAX_VALUE)// && topResult != null) + if (topID != Short.MAX_VALUE) // && topResult != null) { topEnum = TConstructRegistry.getMaterial(topID); hasTop = true; title = "\u00A7n" + topEnum.localizedName(); - } - else - hasTop = false; + } else hasTop = false; } - if (bottomMaterial != bottom) - { + if (bottomMaterial != bottom) { bottomMaterial = bottom; int bottomID = PatternBuilder.instance.getPartID(bottom); - if (bottomID != Short.MAX_VALUE)// && bottomResult != null) + if (bottomID != Short.MAX_VALUE) // && bottomResult != null) { bottomEnum = TConstructRegistry.getMaterial(bottomID); hasBottom = true; otherTitle = "\u00A7n" + bottomEnum.localizedName(); - } - else - hasBottom = false; + } else hasBottom = false; } int offset = 8; - if (hasTop) - { + if (hasTop) { this.drawCenteredString(fontRendererObj, title, descTextLeft + DESC_WIDTH / 2, offset, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), descTextLeft + 8, offset + 16, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", descTextLeft + 8, offset + 27, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, descTextLeft + 8, offset + 38, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter7") + HarvestLevels.getHarvestLevelName(topEnum.harvestLevel()), descTextLeft + 8, offset + 49, 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), + descTextLeft + 8, + offset + 16, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", + descTextLeft + 8, + offset + 27, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, + descTextLeft + 8, + offset + 38, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter7") + + HarvestLevels.getHarvestLevelName(topEnum.harvestLevel()), + descTextLeft + 8, + offset + 49, + 16777215); int attack = topEnum.attack(); - String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); + String heart = attack == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, descTextLeft + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); else - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, descTextLeft + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); } offset = 90; - if (hasBottom) - { + if (hasBottom) { this.drawCenteredString(fontRendererObj, otherTitle, descTextLeft + DESC_WIDTH / 2, offset, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), descTextLeft + 8, offset + 16, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", descTextLeft + 8, offset + 27, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, descTextLeft + 8, offset + 38, 16777215); - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter7") + HarvestLevels.getHarvestLevelName(bottomEnum.harvestLevel()), descTextLeft + 8, offset + 49, 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), + descTextLeft + 8, + offset + 16, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", + descTextLeft + 8, + offset + 27, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, + descTextLeft + 8, + offset + 38, + 16777215); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter7") + + HarvestLevels.getHarvestLevelName(bottomEnum.harvestLevel()), + descTextLeft + 8, + offset + 49, + 16777215); int attack = bottomEnum.attack(); - String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); + String heart = attack == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, descTextLeft + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); else - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, descTextLeft + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, + descTextLeft + 8, + offset + 60, + 0xffffff); } - if (!hasTop && !hasBottom) - drawDefaultInformation(); + if (!hasTop && !hasBottom) drawDefaultInformation(); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/toolparts.png"); - private static final ResourceLocation minichest = new ResourceLocation("tinker", "textures/gui/patternchestmini.png"); + private static final ResourceLocation minichest = + new ResourceLocation("tinker", "textures/gui/patternchestmini.png"); private static final ResourceLocation description = new ResourceLocation("tinker", "textures/gui/description.png"); @Override - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) - { + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); @@ -199,26 +242,21 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) // Draw Slots this.drawTexturedModalRect(craftingLeft + 39, craftingTop + 26, 0, 166, 98, 36); - if (!logic.isStackInSlot(0)) - { + if (!logic.isStackInSlot(0)) { this.drawTexturedModalRect(craftingLeft + 39, craftingTop + 26, 176, 0, 18, 18); } - if (!logic.isStackInSlot(2)) - { + if (!logic.isStackInSlot(2)) { this.drawTexturedModalRect(craftingLeft + 57, craftingTop + 26, 176, 18, 18, 18); } - if (!logic.isStackInSlot(1)) - { + if (!logic.isStackInSlot(1)) { this.drawTexturedModalRect(craftingLeft + 39, craftingTop + 44, 176, 0, 18, 18); } - if (!logic.isStackInSlot(3)) - { + if (!logic.isStackInSlot(3)) { this.drawTexturedModalRect(craftingLeft + 57, craftingTop + 44, 176, 36, 18, 18); } // Draw chest - if (drawChestPart) - { + if (drawChestPart) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(minichest); this.drawTexturedModalRect(chestLeft, chestTop, 0, 0, CHEST_WIDTH, CHEST_HEIGHT); @@ -231,19 +269,14 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) } @Override - public VisiblityData modifyVisiblity (GuiContainer gui, VisiblityData currentVisibility) - { - if (width - xSize < 107) - { + public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { + if (width - xSize < 107) { currentVisibility.showWidgets = false; - } - else - { + } else { currentVisibility.showWidgets = true; } - if (guiLeft < 58) - { + if (guiLeft < 58) { currentVisibility.showStateButtons = false; } @@ -251,33 +284,26 @@ public VisiblityData modifyVisiblity (GuiContainer gui, VisiblityData currentVis } @Override - public Iterable getItemSpawnSlots (GuiContainer gui, ItemStack item) - { + public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item) { return null; } @Override - public List getInventoryAreas (GuiContainer gui) - { + public List getInventoryAreas(GuiContainer gui) { return Collections.emptyList(); } @Override - public boolean handleDragNDrop (GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) - { + public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { return false; } @Override - public boolean hideItemPanelSlot (GuiContainer gui, int x, int y, int w, int h) - { - if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) - return false; + public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { + if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) return false; - if (x - w - 4 < guiLeft - 40 || x + 4 > guiLeft + xSize + DESC_WIDTH) - return false; + if (x - w - 4 < guiLeft - 40 || x + 4 > guiLeft + xSize + DESC_WIDTH) return false; return true; } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/gui/PatternChestGui.java b/src/main/java/tconstruct/tools/gui/PatternChestGui.java index 9ec63fd58a0..fb190fc55e8 100644 --- a/src/main/java/tconstruct/tools/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/tools/gui/PatternChestGui.java @@ -7,12 +7,11 @@ import org.lwjgl.opengl.GL11; import tconstruct.tools.logic.PatternChestLogic; -public class PatternChestGui extends GuiContainer -{ +public class PatternChestGui extends GuiContainer { public PatternChestLogic logic; - public PatternChestGui(InventoryPlayer inventoryplayer, PatternChestLogic holder, World world, int x, int y, int z) - { + public PatternChestGui( + InventoryPlayer inventoryplayer, PatternChestLogic holder, World world, int x, int y, int z) { super(holder.getGuiContainer(inventoryplayer, world, x, y, z)); logic = holder; xSize = 194; @@ -20,17 +19,16 @@ public PatternChestGui(InventoryPlayer inventoryplayer, PatternChestLogic holder } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png"); @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java index dbd000cdd3e..11244e08394 100644 --- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java @@ -4,6 +4,8 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import java.util.Collections; +import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -18,56 +20,48 @@ import tconstruct.tools.logic.StencilTableLogic; import tconstruct.util.network.PatternTablePacket; -import java.util.Collections; -import java.util.List; - @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") -public class StencilTableGui extends GuiContainer implements INEIGuiHandler -{ - int[] buttonsLeftRect = new int[]{ Integer.MAX_VALUE, Integer.MIN_VALUE }; - int[] buttonsRightRect = new int[]{ Integer.MIN_VALUE, Integer.MIN_VALUE }; +public class StencilTableGui extends GuiContainer implements INEIGuiHandler { + int[] buttonsLeftRect = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE}; + int[] buttonsRightRect = new int[] {Integer.MIN_VALUE, Integer.MIN_VALUE}; StencilTableLogic logic; int activeButton; - public StencilTableGui(InventoryPlayer inventoryplayer, StencilTableLogic shaper, World world, int x, int y, int z) - { + public StencilTableGui( + InventoryPlayer inventoryplayer, StencilTableLogic shaper, World world, int x, int y, int z) { super(new PatternShaperContainer(inventoryplayer, shaper)); logic = shaper; activeButton = 0; } @Override - public void onGuiClosed () - { + public void onGuiClosed() { super.onGuiClosed(); } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png"); @Override - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) - { + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); - if (!logic.isStackInSlot(0)) - { + if (!logic.isStackInSlot(0)) { this.drawTexturedModalRect(cornerX + 47, cornerY + 34, 176, 0, 18, 18); } } @Override - public void initGui () - { + public void initGui() { super.initGui(); int bpr = 4; // buttons per row! @@ -75,16 +69,22 @@ public void initGui () int cornerY = this.guiTop + 2; this.buttonList.clear(); - this.buttonsLeftRect = new int[]{ Integer.MAX_VALUE, Integer.MIN_VALUE }; - this.buttonsRightRect = new int[]{ Integer.MIN_VALUE, Integer.MIN_VALUE }; + this.buttonsLeftRect = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE}; + this.buttonsRightRect = new int[] {Integer.MIN_VALUE, Integer.MIN_VALUE}; int id = 0; - for (int iter = 0; iter < TConstructClientRegistry.stencilButtons.size(); iter++) - { + for (int iter = 0; iter < TConstructClientRegistry.stencilButtons.size(); iter++) { StencilGuiElement element = TConstructClientRegistry.stencilButtons.get(iter); - if (element.stencilIndex == -1) - continue; - GuiButtonStencil button = new GuiButtonStencil(id++, cornerX + 22 * (iter % bpr), cornerY + 22 * (iter / bpr), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); + if (element.stencilIndex == -1) continue; + GuiButtonStencil button = new GuiButtonStencil( + id++, + cornerX + 22 * (iter % bpr), + cornerY + 22 * (iter / bpr), + element.buttonIconX, + element.buttonIconY, + element.domain, + element.texture, + element); this.buttonList.add(button); this.buttonsLeftRect[0] = Math.min(button.xPosition, this.buttonsLeftRect[0]); this.buttonsLeftRect[1] = Math.max(button.yPosition + button.height, this.buttonsLeftRect[1]); @@ -93,12 +93,18 @@ public void initGui () // secondary buttons, yay! // these are to use for other mods :I cornerX = this.guiLeft + this.xSize + 4; - for (int iter = 0; iter < TConstructClientRegistry.stencilButtons2.size(); iter++) - { + for (int iter = 0; iter < TConstructClientRegistry.stencilButtons2.size(); iter++) { StencilGuiElement element = TConstructClientRegistry.stencilButtons2.get(iter); - if (element.stencilIndex == -1) - continue; - GuiButtonStencil button = new GuiButtonStencil(id++, cornerX + 22 * (iter % bpr), cornerY + 22 * (iter / bpr), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); + if (element.stencilIndex == -1) continue; + GuiButtonStencil button = new GuiButtonStencil( + id++, + cornerX + 22 * (iter % bpr), + cornerY + 22 * (iter / bpr), + element.buttonIconX, + element.buttonIconY, + element.domain, + element.texture, + element); this.buttonList.add(button); this.buttonsRightRect[0] = Math.max(button.xPosition + button.width, this.buttonsRightRect[0]); this.buttonsRightRect[1] = Math.max(button.yPosition + button.height, this.buttonsRightRect[1]); @@ -106,29 +112,24 @@ public void initGui () // get the correct setting :I ItemStack stack; - if (logic.getStackInSlot(1) != null) - { + if (logic.getStackInSlot(1) != null) { activeButton = StencilBuilder.getId(logic.getStackInSlot(1)); setActiveButton(activeButton); - stack = StencilBuilder.getStencil(((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex); - } - else - stack = null; + stack = StencilBuilder.getStencil( + ((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex); + } else stack = null; logic.setSelectedPattern(stack); updateServer(stack); } @Override - protected void actionPerformed (GuiButton button) - { + protected void actionPerformed(GuiButton button) { ItemStack pattern = logic.getStackInSlot(0); - if (pattern != null && StencilBuilder.isBlank(pattern)) - { + if (pattern != null && StencilBuilder.isBlank(pattern)) { int id = ((GuiButtonStencil) button).element.stencilIndex; ItemStack stack = StencilBuilder.getStencil(id); - if (stack != null) - { + if (stack != null) { logic.setSelectedPattern(stack); updateServer(stack); } @@ -137,8 +138,7 @@ protected void actionPerformed (GuiButton button) setActiveButton(button.id); } - private void setActiveButton (int id) - { + private void setActiveButton(int id) { // deactivate old button ((GuiButton) this.buttonList.get(activeButton)).enabled = true; // update active button @@ -147,8 +147,7 @@ private void setActiveButton (int id) ((GuiButton) this.buttonList.get(activeButton)).enabled = false; } - void updateServer (ItemStack stack) - { + void updateServer(ItemStack stack) { TConstruct.packetPipeline.sendToServer(new PatternTablePacket(logic.xCoord, logic.yCoord, logic.zCoord, stack)); } @@ -173,11 +172,13 @@ public boolean handleDragNDrop(GuiContainer guiContainer, int i, int i2, ItemSta } @Override - public boolean hideItemPanelSlot(GuiContainer guiContainer, int x, int y, int w, int h) - { + public boolean hideItemPanelSlot(GuiContainer guiContainer, int x, int y, int w, int h) { // is it in the horizontal column of the right buttons? - if (x > this.guiLeft + this.xSize && x < this.buttonsRightRect[0] && y + h > this.guiTop && y < this.buttonsRightRect[1]) { + if (x > this.guiLeft + this.xSize + && x < this.buttonsRightRect[0] + && y + h > this.guiTop + && y < this.buttonsRightRect[1]) { return true; } @@ -188,4 +189,4 @@ public boolean hideItemPanelSlot(GuiContainer guiContainer, int x, int y, int w, return false; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java index 486d3074e40..f9c734d39c3 100644 --- a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java @@ -9,45 +9,64 @@ import tconstruct.tools.logic.ToolForgeLogic; @SideOnly(Side.CLIENT) -public class ToolForgeGui extends ToolStationGui -{ +public class ToolForgeGui extends ToolStationGui { int selectedButton; - public ToolForgeGui(InventoryPlayer inventoryplayer, ToolForgeLogic stationlogic, World world, int x, int y, int z) - { + public ToolForgeGui( + InventoryPlayer inventoryplayer, ToolForgeLogic stationlogic, World world, int x, int y, int z) { super(inventoryplayer, stationlogic, world, x, y, z); } @Override - public void initGui () - { + public void initGui() { super.initGui(); this.buttonList.clear(); ToolGuiElement repair = TConstructClientRegistry.toolButtons.get(0); - GuiButtonTool repairButton = new GuiButtonTool(0, this.guiLeft, this.guiTop, repair.buttonIconX, repair.buttonIconY, repair.domain, repair.texture, repair); // Repair + GuiButtonTool repairButton = new GuiButtonTool( + 0, + this.guiLeft, + this.guiTop, + repair.buttonIconX, + repair.buttonIconY, + repair.domain, + repair.texture, + repair); // Repair repairButton.enabled = false; this.buttonList.add(repairButton); int offset = TConstructClientRegistry.tierTwoButtons.size(); - for (int iter = 0; iter < TConstructClientRegistry.tierTwoButtons.size(); iter++) - { + for (int iter = 0; iter < TConstructClientRegistry.tierTwoButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.tierTwoButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter + 1, this.guiLeft + 22 * ((iter + 1) % 5), this.guiTop + 22 * ((iter + 1) / 5), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool( + iter + 1, + this.guiLeft + 22 * ((iter + 1) % 5), + this.guiTop + 22 * ((iter + 1) / 5), + element.buttonIconX, + element.buttonIconY, + element.domain, + element.texture, + element); this.buttonList.add(button); } - for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) - { + for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter + offset, this.guiLeft + 22 * ((iter + offset) % 5), this.guiTop + 22 * ((iter + offset) / 5), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool( + iter + offset, + this.guiLeft + 22 * ((iter + offset) % 5), + this.guiTop + 22 * ((iter + offset) / 5), + element.buttonIconX, + element.buttonIconY, + element.domain, + element.texture, + element); this.buttonList.add(button); } } @Override - protected void actionPerformed (GuiButton button) - { + protected void actionPerformed(GuiButton button) { GuiButtonTool b = (GuiButtonTool) button; ((GuiButton) this.buttonList.get(selectedButton)).enabled = true; selectedButton = button.id; @@ -58,73 +77,70 @@ protected void actionPerformed (GuiButton button) iconY = b.element.iconsY; title = "\u00A7n" + b.element.title; body = StatCollector.translateToLocal(b.element.body); - if(body != null) { + if (body != null) { int i; - // for some really weird reason replaceAll doesn't find "\\n", but indexOf does. We have to replace manually. - while((i = body.indexOf("\\n")) >= 0) - { - body = body.substring(0, i) + '\n' + body.substring(i+2); + // for some really weird reason replaceAll doesn't find "\\n", but indexOf does. We have to replace + // manually. + while ((i = body.indexOf("\\n")) >= 0) { + body = body.substring(0, i) + '\n' + body.substring(i + 2); } } } @Override - void resetGui () - { + void resetGui() { this.text.setText(""); selectedButton = 0; setSlotType(0); - iconX = new int[] { 0, 1, 2, 13 }; - iconY = new int[] { 13, 13, 13, 13 }; + iconX = new int[] {0, 1, 2, 13}; + iconY = new int[] {13, 13, 13, 13}; title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1"); body = StatCollector.translateToLocal("gui.toolforge2"); } @Override - void setSlotType (int type) - { - switch (type) - { - case 0: - slotX = new int[] { 56, 38, 38, 14 }; // Repair - slotY = new int[] { 37, 28, 46, 37 }; - break; - case 1: - slotX = new int[] { 56, 56, 56, 14 }; // Three parts - slotY = new int[] { 19, 55, 37, 37 }; - break; - case 2: - slotX = new int[] { 56, 56, 14, 14 }; // Two parts - slotY = new int[] { 28, 46, 28, 46 }; - break; - case 3: - slotX = new int[] { 38, 47, 56, 14 }; // Double head - slotY = new int[] { 28, 46, 28, 37 }; - break; - case 4: - slotX = new int[] { 47, 38, 56, 47 }; // Four parts - slotY = new int[] { 19, 37, 37, 55 }; - break; - case 5: - slotX = new int[] { 38, 47, 56, 47 }; // Four parts, double head - slotY = new int[] { 19, 55, 19, 37 }; - break; - case 6: - slotX = new int[] { 38, 38, 20, 56 }; // Double head - slotY = new int[] { 28, 46, 28, 28 }; - break; - case 7: - slotX = new int[] { 56, 56, 56, 14 }; // Three parts reverse - slotY = new int[] { 19, 37, 55, 37 }; - break; - case 8: - slotX = new int[] { 20, 38, 56, 38 }; // Double head middle - slotY = new int[] { 28, 46, 28, 28 }; - break; - case 9: - slotX = new int[] { 38, 56, 47, 47 }; // Four parts, crossbow. - slotY = new int[] { 37, 37, 55, 19 }; - break; + void setSlotType(int type) { + switch (type) { + case 0: + slotX = new int[] {56, 38, 38, 14}; // Repair + slotY = new int[] {37, 28, 46, 37}; + break; + case 1: + slotX = new int[] {56, 56, 56, 14}; // Three parts + slotY = new int[] {19, 55, 37, 37}; + break; + case 2: + slotX = new int[] {56, 56, 14, 14}; // Two parts + slotY = new int[] {28, 46, 28, 46}; + break; + case 3: + slotX = new int[] {38, 47, 56, 14}; // Double head + slotY = new int[] {28, 46, 28, 37}; + break; + case 4: + slotX = new int[] {47, 38, 56, 47}; // Four parts + slotY = new int[] {19, 37, 37, 55}; + break; + case 5: + slotX = new int[] {38, 47, 56, 47}; // Four parts, double head + slotY = new int[] {19, 55, 19, 37}; + break; + case 6: + slotX = new int[] {38, 38, 20, 56}; // Double head + slotY = new int[] {28, 46, 28, 28}; + break; + case 7: + slotX = new int[] {56, 56, 56, 14}; // Three parts reverse + slotY = new int[] {19, 37, 55, 37}; + break; + case 8: + slotX = new int[] {20, 38, 56, 38}; // Double head middle + slotY = new int[] {28, 46, 28, 28}; + break; + case 9: + slotX = new int[] {38, 56, 47, 47}; // Four parts, crossbow. + slotY = new int[] {37, 37, 55, 19}; + break; } toolSlots.resetSlots(slotX, slotY); } diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index ba347688184..36bc5d779cc 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -6,6 +6,8 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.Collections; +import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; @@ -24,13 +26,9 @@ import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.network.ToolStationPacket; -import java.util.Collections; -import java.util.List; - @SideOnly(Side.CLIENT) @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") -public class ToolStationGui extends GuiContainer implements INEIGuiHandler -{ +public class ToolStationGui extends GuiContainer implements INEIGuiHandler { public ToolStationLogic logic; public ToolStationContainer toolSlots; public GuiTextField text; @@ -40,8 +38,8 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler public boolean active; public String title, body = ""; - public ToolStationGui(InventoryPlayer inventoryplayer, ToolStationLogic stationlogic, World world, int x, int y, int z) - { + public ToolStationGui( + InventoryPlayer inventoryplayer, ToolStationLogic stationlogic, World world, int x, int y, int z) { super((ActiveContainer) stationlogic.getGuiContainer(inventoryplayer, world, x, y, z)); this.logic = stationlogic; toolSlots = (ToolStationContainer) inventorySlots; @@ -58,11 +56,9 @@ public ToolStationGui(InventoryPlayer inventoryplayer, ToolStationLogic stationl } @Override - protected void mouseClicked (int mouseX, int mouseY, int mouseButton) - { + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { super.mouseClicked(mouseX, mouseY, mouseButton); - if (mouseButton == 0) - { + if (mouseButton == 0) { int gLeft = this.guiLeft + 68 + 110; int gTop = this.guiTop + 6; int gwidth = 102; @@ -71,41 +67,53 @@ protected void mouseClicked (int mouseX, int mouseY, int mouseButton) } } - void resetGui () - { + void resetGui() { this.text.setText(""); guiType = 0; setSlotType(0); - iconX = new int[] { 0, 1, 2 }; - iconY = new int[] { 13, 13, 13 }; + iconX = new int[] {0, 1, 2}; + iconY = new int[] {13, 13, 13}; title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1"); body = StatCollector.translateToLocal("gui.toolforge2"); } @Override - public void initGui () - { + public void initGui() { super.initGui(); this.xSize = 176 + 110; this.guiLeft = (this.width - 176) / 2 - 110; this.buttonList.clear(); ToolGuiElement repair = TConstructClientRegistry.toolButtons.get(0); - GuiButtonTool repairButton = new GuiButtonTool(0, this.guiLeft, this.guiTop, repair.buttonIconX, repair.buttonIconY, repair.domain, repair.texture, repair); // Repair + GuiButtonTool repairButton = new GuiButtonTool( + 0, + this.guiLeft, + this.guiTop, + repair.buttonIconX, + repair.buttonIconY, + repair.domain, + repair.texture, + repair); // Repair repairButton.enabled = false; this.buttonList.add(repairButton); - for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) - { + for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter, this.guiLeft + 22 * (iter % 5), this.guiTop + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool( + iter, + this.guiLeft + 22 * (iter % 5), + this.guiTop + 22 * (iter / 5), + element.buttonIconX, + element.buttonIconY, + element.domain, + element.texture, + element); this.buttonList.add(button); } } @Override - protected void actionPerformed (GuiButton button) - { + protected void actionPerformed(GuiButton button) { ((GuiButton) this.buttonList.get(guiType)).enabled = true; guiType = button.id; button.enabled = false; @@ -116,47 +124,44 @@ protected void actionPerformed (GuiButton button) iconY = element.iconsY; title = "\u00A7n" + element.title; body = StatCollector.translateToLocal(element.body); - if(body != null) { + if (body != null) { int i; - // for some really weird reason replaceAll doesn't find "\\n", but indexOf does. We have to replace manually. - while((i = body.indexOf("\\n")) >= 0) - { - body = body.substring(0, i) + '\n' + body.substring(i+2); + // for some really weird reason replaceAll doesn't find "\\n", but indexOf does. We have to replace + // manually. + while ((i = body.indexOf("\\n")) >= 0) { + body = body.substring(0, i) + '\n' + body.substring(i + 2); } } } - void setSlotType (int type) - { - switch (type) - { - case 0: - slotX = new int[] { 56, 38, 38 }; // Repair - slotY = new int[] { 37, 28, 46 }; - break; - case 1: - slotX = new int[] { 56, 56, 56 }; // Three parts - slotY = new int[] { 19, 55, 37 }; - break; - case 2: - slotX = new int[] { 56, 56, 14 }; // Two parts - slotY = new int[] { 28, 46, 37 }; - break; - case 3: - slotX = new int[] { 38, 47, 56 }; // Double head - slotY = new int[] { 28, 46, 28 }; - break; - case 7: - slotX = new int[] { 56, 56, 56 }; // Three parts reverse - slotY = new int[] { 19, 37, 55 }; - break; + void setSlotType(int type) { + switch (type) { + case 0: + slotX = new int[] {56, 38, 38}; // Repair + slotY = new int[] {37, 28, 46}; + break; + case 1: + slotX = new int[] {56, 56, 56}; // Three parts + slotY = new int[] {19, 55, 37}; + break; + case 2: + slotX = new int[] {56, 56, 14}; // Two parts + slotY = new int[] {28, 46, 37}; + break; + case 3: + slotX = new int[] {38, 47, 56}; // Double head + slotY = new int[] {28, 46, 28}; + break; + case 7: + slotX = new int[] {56, 56, 56}; // Three parts reverse + slotY = new int[] {19, 37, 55}; + break; } toolSlots.resetSlots(slotX, slotY); } @Override - public void updateScreen () - { + public void updateScreen() { super.updateScreen(); this.text.updateCursorCounter(); } @@ -166,20 +171,17 @@ public void updateScreen () * the items) */ @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { + protected void drawGuiContainerForegroundLayer(int par1, int par2) { this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.getInvName()), 116, 8, 0x000000); - this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 118, this.ySize - 96 + 2, 0x000000); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), 118, this.ySize - 96 + 2, 0x000000); this.fontRendererObj.drawString(toolName + "_", 180, 8, 0xffffff); - if (logic.isStackInSlot(0)) - ToolStationGuiHelper.drawToolStats(logic.getStackInSlot(0), 294, 0); - else - drawToolInformation(); + if (logic.isStackInSlot(0)) ToolStationGuiHelper.drawToolStats(logic.getStackInSlot(0), 294, 0); + else drawToolInformation(); } - protected void drawToolInformation () - { + protected void drawToolInformation() { this.drawCenteredString(fontRendererObj, title, 349, 8, 0xffffff); fontRendererObj.drawSplitString(body, 294, 24, 115, 0xffffff); } @@ -193,16 +195,14 @@ protected void drawToolInformation () * items) */ @Override - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) - { + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); final int cornerX = this.guiLeft + 110; this.drawTexturedModalRect(cornerX, this.guiTop, 0, 0, 176, this.ySize); - if (active) - { + if (active) { this.drawTexturedModalRect(cornerX + 62, this.guiTop, 0, this.ySize, 112, 22); } @@ -210,12 +210,11 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) this.mc.getTextureManager().bindTexture(icons); // Draw the slots - for (int i = 0; i < slotX.length; i++) - { + for (int i = 0; i < slotX.length; i++) { this.drawTexturedModalRect(cornerX + slotX[i], this.guiTop + slotY[i], 144, 216, 18, 18); - if (!logic.isStackInSlot(i + 1)) - { - this.drawTexturedModalRect(cornerX + slotX[i], this.guiTop + slotY[i], 18 * iconX[i], 18 * iconY[i], 18, 18); + if (!logic.isStackInSlot(i + 1)) { + this.drawTexturedModalRect( + cornerX + slotX[i], this.guiTop + slotY[i], 18 * iconX[i], 18 * iconY[i], 18, 18); } } @@ -223,21 +222,16 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(description); this.drawTexturedModalRect(cornerX + 176, this.guiTop, 0, 0, 126, this.ySize + 30); - } @Override - protected void keyTyped (char par1, int keyCode) - { - if (keyCode == 1 || (!active && keyCode == this.mc.gameSettings.keyBindInventory.getKeyCode())) - { + protected void keyTyped(char par1, int keyCode) { + if (keyCode == 1 || (!active && keyCode == this.mc.gameSettings.keyBindInventory.getKeyCode())) { logic.setToolname(""); updateServer(""); Keyboard.enableRepeatEvents(false); this.mc.thePlayer.closeScreen(); - } - else if (active) - { + } else if (active) { text.textboxKeyTyped(par1, keyCode); toolName = text.getText().trim(); logic.setToolname(toolName); @@ -245,8 +239,7 @@ else if (active) } } - void updateServer (String name) - { + void updateServer(String name) { /* * ByteArrayOutputStream bos = new ByteArrayOutputStream(8); * DataOutputStream outputStream = new DataOutputStream(bos); try { @@ -256,11 +249,11 @@ void updateServer (String name) * outputStream.writeInt(logic.yCoord); * outputStream.writeInt(logic.zCoord); outputStream.writeUTF(name); } * catch (Exception ex) { ex.printStackTrace(); } - * + * * Packet250CustomPayload packet = new Packet250CustomPayload(); * packet.channel = "TConstruct"; packet.data = bos.toByteArray(); * packet.length = bos.size(); - * + * * PacketDispatcher.sendPacketToServer(packet); */ @@ -274,19 +267,14 @@ void updateServer (String name) */ @Override - public VisiblityData modifyVisiblity (GuiContainer gui, VisiblityData currentVisibility) - { - if (width - xSize < 107) - { + public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { + if (width - xSize < 107) { currentVisibility.showWidgets = false; - } - else - { + } else { currentVisibility.showWidgets = true; } - if (guiLeft < 58) - { + if (guiLeft < 58) { currentVisibility.showStateButtons = false; } @@ -294,31 +282,25 @@ public VisiblityData modifyVisiblity (GuiContainer gui, VisiblityData currentVis } @Override - public Iterable getItemSpawnSlots (GuiContainer gui, ItemStack item) - { + public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item) { return null; } @Override - public List getInventoryAreas (GuiContainer gui) - { + public List getInventoryAreas(GuiContainer gui) { return Collections.emptyList(); } @Override - public boolean handleDragNDrop (GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) - { + public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { return false; } @Override - public boolean hideItemPanelSlot (GuiContainer gui, int x, int y, int w, int h) - { - if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) - return false; + public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { + if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) return false; - if (x - w - 4 < guiLeft - 40 || x + 4 > guiLeft + xSize + 126) - return false; + if (x - w - 4 < guiLeft - 40 || x + 4 > guiLeft + xSize + 126) return false; return true; } diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java index 0b314c7ff58..ff35182c95c 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java @@ -1,5 +1,9 @@ package tconstruct.tools.gui; +import java.text.DecimalFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; @@ -11,21 +15,12 @@ import tconstruct.library.armor.ArmorCore; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.DualHarvestTool; -import tconstruct.library.tools.HarvestTool; import tconstruct.library.tools.ToolCore; import tconstruct.library.util.HarvestLevels; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.library.weaponry.IAmmo; import tconstruct.library.weaponry.ProjectileWeapon; -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; - public final class ToolStationGuiHelper { // non-instantiable private ToolStationGuiHelper() {} @@ -33,23 +28,21 @@ private ToolStationGuiHelper() {} private static final FontRenderer fontRendererObj = Minecraft.getMinecraft().fontRenderer; private static int xPos, yPos; - private static final DecimalFormat df = new DecimalFormat("#.##"); + private static final DecimalFormat df = new DecimalFormat("#.##"); - private static void newline() - { + private static void newline() { yPos += 10; } - - private static void write(String s) - { + private static void write(String s) { fontRendererObj.drawString(s, xPos, yPos, 0xffffffff); newline(); } - public static void drawToolStats (ItemStack stack, int x, int y) - { - String name = stack.getItem() instanceof ToolCore ? ((ToolCore) stack.getItem()).getLocalizedToolName() : stack.getDisplayName(); + public static void drawToolStats(ItemStack stack, int x, int y) { + String name = stack.getItem() instanceof ToolCore + ? ((ToolCore) stack.getItem()).getLocalizedToolName() + : stack.getDisplayName(); Item item = stack.getItem(); NBTTagCompound tags = stack.getTagCompound(); Collection categories = new LinkedList(); @@ -59,7 +52,7 @@ public static void drawToolStats (ItemStack stack, int x, int y) yPos = y + 8; // get the correct tags - if(item instanceof IModifyable) { + if (item instanceof IModifyable) { IModifyable modifyable = (IModifyable) item; tags = tags.getCompoundTag(modifyable.getBaseTagName()); categories = Arrays.asList(modifyable.getTraits()); @@ -70,24 +63,19 @@ public static void drawToolStats (ItemStack stack, int x, int y) newline(); // does it have ammo instead of durability? - if(item instanceof IAmmo) - drawAmmo((IAmmo) item, stack); + if (item instanceof IAmmo) drawAmmo((IAmmo) item, stack); // regular durability? - else if(item instanceof ToolCore || item instanceof ArmorCore) - drawDurability(tags); + else if (item instanceof ToolCore || item instanceof ArmorCore) drawDurability(tags); // tools - if(item instanceof ToolCore) { + if (item instanceof ToolCore) { ToolCore tool = (ToolCore) item; // DualHarvest tool? - if (categories.contains("dualharvest")) - drawDualHarvestStats(tool, tags); + if (categories.contains("dualharvest")) drawDualHarvestStats(tool, tags); // or regular Harvest tool? - else if (categories.contains("harvest")) - drawHarvestStats(tool, tags); + else if (categories.contains("harvest")) drawHarvestStats(tool, tags); // weapon? - if (categories.contains("weapon")) - drawWeaponStats(tool, tags); + if (categories.contains("weapon")) drawWeaponStats(tool, tags); // throwing weapon? if (categories.contains("thrown") && tool instanceof AmmoWeapon) drawThrowingWeaponStats((AmmoWeapon) tool, tags); @@ -95,18 +83,15 @@ else if (categories.contains("harvest")) if (categories.contains("bow") && tool instanceof ProjectileWeapon) drawProjectileWeaponStats((ProjectileWeapon) tool, tags, stack); // projectile? - if (categories.contains("projectile")) - drawProjectileStats(tags); + if (categories.contains("projectile")) drawProjectileStats(tags); } // armor - if(item instanceof ArmorCore) - { + if (item instanceof ArmorCore) { ArmorCore armor = (ArmorCore) item; drawArmorStats(armor, tags, stack); } // Accessory - if(item instanceof AccessoryCore) - { + if (item instanceof AccessoryCore) { AccessoryCore accessory = (AccessoryCore) item; drawAccessoryStats(accessory, tags); } @@ -123,31 +108,25 @@ private static void drawDurability(NBTTagCompound tags) { final int availableDurability = maxDur - durability; // big durabilities have to split to 2 lines - if (maxDur >= 10000) - { + if (maxDur >= 10000) { write(StatCollector.translateToLocal("gui.toolstation1")); write("- " + availableDurability + "/" + maxDur); - } - else - { + } else { write(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur); } } - private static void drawAmmo(IAmmo ammoItem, ItemStack stack) - { + private static void drawAmmo(IAmmo ammoItem, ItemStack stack) { final int max = ammoItem.getMaxAmmo(stack); final int current = ammoItem.getAmmoCount(stack); - write(StatCollector.translateToLocal("gui.toolstation21") + current + "/" + max); + write(StatCollector.translateToLocal("gui.toolstation21") + current + "/" + max); } - private static void drawModifiers(NBTTagCompound tags) - { + private static void drawModifiers(NBTTagCompound tags) { int modifiers = tags.getInteger("Modifiers"); // remaining modifiers - if (modifiers != 0) - write(StatCollector.translateToLocal("gui.toolstation18") + modifiers); + if (modifiers != 0) write(StatCollector.translateToLocal("gui.toolstation18") + modifiers); // Modifier-header (if we have modifiers) if (tags.hasKey("ModifierTip1")) { @@ -160,14 +139,15 @@ private static void drawModifiers(NBTTagCompound tags) String locString = "modifier.toolstation." + tipName; // strip out the '(X of Y)' in some for the localization strings.. sigh int bracket = tipName.indexOf("("); - if(bracket > 0) - locString = "modifier.toolstation." + tipName.substring(0, bracket); + if (bracket > 0) locString = "modifier.toolstation." + tipName.substring(0, bracket); locString = EnumChatFormatting.getTextWithoutFormattingCodes(locString.replace(" ", "")); - if(StatCollector.canTranslate(locString)) { - tipName = tipName.replace(EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); + if (StatCollector.canTranslate(locString)) { + tipName = tipName.replace( + EnumChatFormatting.getTextWithoutFormattingCodes(tipName), + StatCollector.translateToLocal(locString)); // re-add the X/Y - if(bracket > 0) + if (bracket > 0) tipName += " " + tags.getString(tooltip + tipNum).substring(bracket); } write("- " + tipName); @@ -176,40 +156,41 @@ private static void drawModifiers(NBTTagCompound tags) } } - private static void drawHarvestStats(ToolCore tool, NBTTagCompound tags) - { + private static void drawHarvestStats(ToolCore tool, NBTTagCompound tags) { float mineSpeed = AbilityHelper.calcToolSpeed(tool, tags); float stoneboundSpeed = AbilityHelper.calcStoneboundBonus(tool, tags); write(StatCollector.translateToLocal("gui.toolstation14") + df.format(mineSpeed)); - if(stoneboundSpeed != 0) - { - String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); + if (stoneboundSpeed != 0) { + String bloss = stoneboundSpeed > 0 + ? StatCollector.translateToLocal("gui.toolstation4") + : StatCollector.translateToLocal("gui.toolstation5"); write(bloss + df.format(stoneboundSpeed)); } - write(StatCollector.translateToLocal("gui.toolstation15") + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel"))); + write(StatCollector.translateToLocal("gui.toolstation15") + + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel"))); } - private static void drawDualHarvestStats(ToolCore tool, NBTTagCompound tags) - { + private static void drawDualHarvestStats(ToolCore tool, NBTTagCompound tags) { float mineSpeed = AbilityHelper.calcDualToolSpeed(tool, tags, false); float mineSpeed2 = AbilityHelper.calcDualToolSpeed(tool, tags, true); float stoneboundSpeed = AbilityHelper.calcStoneboundBonus(tool, tags); write(StatCollector.translateToLocal("gui.toolstation12")); write("- " + df.format(mineSpeed) + ", " + df.format(mineSpeed2)); - if (stoneboundSpeed != 0) - { - String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); + if (stoneboundSpeed != 0) { + String bloss = stoneboundSpeed > 0 + ? StatCollector.translateToLocal("gui.toolstation4") + : StatCollector.translateToLocal("gui.toolstation5"); write(bloss + df.format(stoneboundSpeed)); } write(StatCollector.translateToLocal("gui.toolstation13")); - write("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2"))); + write("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2"))); } - private static void drawWeaponStats(ToolCore tool, NBTTagCompound tags) - { + private static void drawWeaponStats(ToolCore tool, NBTTagCompound tags) { // DAMAGE int attack = (tags.getInteger("Attack")); @@ -218,19 +199,21 @@ private static void drawWeaponStats(ToolCore tool, NBTTagCompound tags) attack += stoneboundDamage; attack *= tool.getDamageModifier(); - if (attack < 1) - attack = 1; - - String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (attack % 2 == 0) - write(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart); - else - write(StatCollector.translateToLocal("gui.toolstation3") + df.format(attack / 2f) + heart); - - if (stoneboundDamage != 0) - { - heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); + if (attack < 1) attack = 1; + + String heart = attack == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); + if (attack % 2 == 0) write(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart); + else write(StatCollector.translateToLocal("gui.toolstation3") + df.format(attack / 2f) + heart); + + if (stoneboundDamage != 0) { + heart = stoneboundDamage == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); + String bloss = stoneboundDamage > 0 + ? StatCollector.translateToLocal("gui.toolstation4") + : StatCollector.translateToLocal("gui.toolstation5"); write(bloss + df.format(stoneboundDamage / 2f) + heart); } } @@ -240,20 +223,18 @@ private static void drawThrowingWeaponStats(AmmoWeapon weapon, NBTTagCompound ta attackf *= weapon.getDamageModifier(); attackf *= weapon.getProjectileSpeed(); - if (attackf < 1) - attackf = 1; + if (attackf < 1) attackf = 1; - int attack = (int)attackf; + int attack = (int) attackf; - String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); - if (attack % 2 == 0) - write(StatCollector.translateToLocal("gui.toolstation23") + attack / 2 + heart); - else - write(StatCollector.translateToLocal("gui.toolstation23") + df.format(attack / 2f) + heart); + String heart = attack == 2 + ? StatCollector.translateToLocal("gui.partcrafter8") + : StatCollector.translateToLocal("gui.partcrafter9"); + if (attack % 2 == 0) write(StatCollector.translateToLocal("gui.toolstation23") + attack / 2 + heart); + else write(StatCollector.translateToLocal("gui.toolstation23") + df.format(attack / 2f) + heart); } - private static void drawProjectileWeaponStats(ProjectileWeapon weapon, NBTTagCompound tags, ItemStack stack) - { + private static void drawProjectileWeaponStats(ProjectileWeapon weapon, NBTTagCompound tags, ItemStack stack) { // drawspeed final int drawSpeed = weapon.getWindupTime(stack); final float trueDraw = drawSpeed / 20f; @@ -264,8 +245,7 @@ private static void drawProjectileWeaponStats(ProjectileWeapon weapon, NBTTagCom write(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x"); } - private static void drawProjectileStats(NBTTagCompound tags) - { + private static void drawProjectileStats(NBTTagCompound tags) { // weight final float weight = tags.getFloat("Mass"); write(StatCollector.translateToLocal("gui.toolstation8") + df.format(weight)); @@ -279,23 +259,22 @@ private static void drawProjectileStats(NBTTagCompound tags) write(StatCollector.translateToLocal("gui.toolstation22") + df.format(breakChance) + "%"); } - private static void drawArmorStats(ArmorCore armor, NBTTagCompound tags, ItemStack stack) - { + private static void drawArmorStats(ArmorCore armor, NBTTagCompound tags, ItemStack stack) { // Damage reduction double damageReduction = tags.getDouble("DamageReduction"); - if(damageReduction > 0) + if (damageReduction > 0) write(StatCollector.translateToLocal("gui.toolstation19") + df.format(damageReduction)); // Protection double protection = armor.getProtection(stack); double maxProtection = tags.getDouble("MaxDefense"); - write(StatCollector.translateToLocal("gui.toolstation20") + df.format(protection) + "/" + df.format(maxProtection)); + write(StatCollector.translateToLocal("gui.toolstation20") + df.format(protection) + "/" + + df.format(maxProtection)); } - private static void drawAccessoryStats(AccessoryCore core, NBTTagCompound tags) - { - if(tags.hasKey("MiningSpeed")) { + private static void drawAccessoryStats(AccessoryCore core, NBTTagCompound tags) { + if (tags.hasKey("MiningSpeed")) { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); write(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed); @@ -306,8 +285,9 @@ private static void drawAccessoryStats(AccessoryCore core, NBTTagCompound tags) * Renders the specified text to the screen, center-aligned. * Copied out of GUI */ - public static void drawCenteredString(FontRenderer p_73732_1_, String p_73732_2_, int p_73732_3_, int p_73732_4_, int p_73732_5_) - { - p_73732_1_.drawStringWithShadow(p_73732_2_, p_73732_3_ - p_73732_1_.getStringWidth(p_73732_2_) / 2, p_73732_4_, p_73732_5_); + public static void drawCenteredString( + FontRenderer p_73732_1_, String p_73732_2_, int p_73732_3_, int p_73732_4_, int p_73732_5_) { + p_73732_1_.drawStringWithShadow( + p_73732_2_, p_73732_3_ - p_73732_1_.getStringWidth(p_73732_2_) / 2, p_73732_4_, p_73732_5_); } } diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index a06029b2d1b..ba1ebb760af 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -1,6 +1,7 @@ package tconstruct.tools.inventory; -import com.google.common.primitives.Ints; +import java.lang.ref.WeakReference; +import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -19,24 +20,20 @@ import tconstruct.tools.gui.ChestSlot; import tconstruct.tools.logic.CraftingStationLogic; -import javax.annotation.Nonnull; -import java.lang.ref.WeakReference; -import java.util.HashSet; -import java.util.Set; - public class CraftingStationContainer extends Container { private final World worldObj; private final int posX; private final int posY; private final int posZ; - + @SuppressWarnings("rawtypes") - private final WeakReference [] inventories; - + private final WeakReference[] inventories; + /** * The crafting matrix inventory (3x3). */ public InventoryCrafting craftMatrix; + public IInventory craftResult; public CraftingStationLogic logic; EntityPlayer player; @@ -55,31 +52,32 @@ public CraftingStationContainer(InventoryPlayer inventoryplayer, CraftingStation int row, col; int bothOffset = 0; - + if (logic.chest != null) { - if(logic.slotCount > 54) - bothOffset += 12; // SlideBar.width + if (logic.slotCount > 54) bothOffset += 12; // SlideBar.width bothOffset += 122; } final int craftingOffsetX = 30 + bothOffset; final int inventoryOffsetX = 8 + bothOffset; - - + // 0 - crafting slot - this.addSlotToContainer(new SlotCraftingStation(inventoryplayer.player, this.craftMatrix, this.craftResult, 0, craftingOffsetX + 94, 35)); + this.addSlotToContainer(new SlotCraftingStation( + inventoryplayer.player, this.craftMatrix, this.craftResult, 0, craftingOffsetX + 94, 35)); // 1 - 9 - Crafting Matrix for (row = 0; row < 3; ++row) { for (col = 0; col < 3; ++col) { - this.addSlotToContainer(new Slot(this.craftMatrix, col + row * 3, craftingOffsetX + col * 18, 17 + row * 18)); + this.addSlotToContainer( + new Slot(this.craftMatrix, col + row * 3, craftingOffsetX + col * 18, 17 + row * 18)); } } // Player Inventory 10 - 36 for (row = 0; row < 3; ++row) { for (col = 0; col < 9; ++col) { - this.addSlotToContainer(new Slot(inventoryplayer, col + row * 9 + 9, inventoryOffsetX + col * 18, 84 + row * 18)); + this.addSlotToContainer( + new Slot(inventoryplayer, col + row * 9 + 9, inventoryOffsetX + col * 18, 84 + row * 18)); } } // Player Hotbar - 37 - 45 @@ -93,20 +91,22 @@ public CraftingStationContainer(InventoryPlayer inventoryplayer, CraftingStation IInventory secondInv = logic.getSecondInventory(); final int accessSide = logic.chestDirection.getOpposite().ordinal(); - final int[] accessibleSlots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(accessSide) : null; - + final int[] accessibleSlots = inv instanceof ISidedInventory + ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(accessSide) + : null; + int index = 0, curIndex = 0; IInventory curInv; - final int invSize = inv.getSizeInventory() * (secondInv != null ? 2 : 1); + final int invSize = inv.getSizeInventory() * (secondInv != null ? 2 : 1); for (row = 0; row < logic.invRows; row++) { for (col = 0; col < logic.invColumns; col++) { - if(index >= invSize) break; + if (index >= invSize) break; // Adjust the inventory to account for double chests curInv = secondInv != null && index >= 27 ? secondInv : inv; // Adjust the index for the inventory curIndex = secondInv != null && index >= 27 ? index - 27 : index; - if(accessibleSlots != null) { + if (accessibleSlots != null) { if (curIndex >= accessibleSlots.length) { break; } else { @@ -114,7 +114,8 @@ public CraftingStationContainer(InventoryPlayer inventoryplayer, CraftingStation } } - this.addSlotToContainer(new ChestSlot(curInv, curIndex, index, 8 + col * 18, 19 + row * 18, accessSide)); + this.addSlotToContainer( + new ChestSlot(curInv, curIndex, index, 8 + col * 18, 19 + row * 18, accessSide)); index++; } } @@ -141,20 +142,21 @@ public ItemStack modifyItem() { public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int index) { Slot slot = (Slot) this.inventorySlots.get(index); - - if(slot == null || !slot.getHasStack()) { + + if (slot == null || !slot.getHasStack()) { return null; } - + ItemStack itemstack = slot.getStack(); ItemStack ret = itemstack.copy(); boolean nothingDone = true; - + if (index == 0) { // Crafting Result if (ret.getItem() instanceof IModifyable) { - nothingDone &= !this.mergeCraftedStack(itemstack, logic.getSizeInventory(), this.inventorySlots.size(), true, entityPlayer); + nothingDone &= !this.mergeCraftedStack( + itemstack, logic.getSizeInventory(), this.inventorySlots.size(), true, entityPlayer); } else { // First refill the attached chests nothingDone &= this.refillChest(itemstack); @@ -164,20 +166,19 @@ public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int index) { } slot.onSlotChange(itemstack, ret); - } else if(index >= 1 && index < 10) { // From Crafting Grid + } else if (index >= 1 && index < 10) { // From Crafting Grid // First refill the attached chests nothingDone &= this.refillChest(itemstack); - + // Then try moving to player inventory nothingDone &= moveToPlayerInventory(itemstack); - } - else if (index >= 10 && index < 46) { // From Player Inv or Hotbar + } else if (index >= 10 && index < 46) { // From Player Inv or Hotbar // First to the crafting Matrix nothingDone &= moveToCraftingGrid(itemstack); - + // Then to any attached chest nothingDone &= this.moveToChest(itemstack); - } else { // From the Attached Chests + } else { // From the Attached Chests // First to the crafting Matrix nothingDone &= moveToCraftingGrid(itemstack); @@ -185,10 +186,10 @@ else if (index >= 10 && index < 46) { // From Player Inv or Hotbar nothingDone &= moveToPlayerInventory(itemstack); } - if(nothingDone) { + if (nothingDone) { return null; } - + if (itemstack.stackSize == 0) { slot.putStack(null); } else { @@ -203,31 +204,32 @@ else if (index >= 10 && index < 46) { // From Player Inv or Hotbar return ret; } + protected boolean refillChest(ItemStack itemstack) { - if(itemstack == null || itemstack.stackSize <= 0 || logic.slotCount == 0) return false; - + if (itemstack == null || itemstack.stackSize <= 0 || logic.slotCount == 0) return false; + return !this.mergeItemStackRefill(itemstack, 46, 46 + logic.slotCount, false); } - + protected boolean moveToChest(ItemStack itemstack) { - if(itemstack == null || itemstack.stackSize <= 0 || logic.slotCount == 0) return false; - + if (itemstack == null || itemstack.stackSize <= 0 || logic.slotCount == 0) return false; + return !this.mergeItemStack(itemstack, 46, 46 + logic.slotCount, false); } - + protected boolean moveToPlayerInventory(ItemStack itemstack) { - if(itemstack == null || itemstack.stackSize <= 0) return false; - + if (itemstack == null || itemstack.stackSize <= 0) return false; + return !this.mergeItemStack(itemstack, 10, 46, false); } - + protected boolean moveToCraftingGrid(ItemStack itemstack) { - if(itemstack == null || itemstack.stackSize <= 0) return false; - + if (itemstack == null || itemstack.stackSize <= 0) return false; + return !this.mergeItemStack(itemstack, 1, 10, true); } - public boolean func_94530_a/*canMergeSlot*/(ItemStack par1ItemStack, Slot par2Slot) { + public boolean func_94530_a /*canMergeSlot*/(ItemStack par1ItemStack, Slot par2Slot) { return par2Slot.inventory != this.craftResult && super.func_94530_a(par1ItemStack, par2Slot); } @@ -248,25 +250,26 @@ public void onContainerClosed(EntityPlayer par1EntityPlayer) { public void onCraftMatrixChanged(IInventory par1IInventory) { ItemStack tool = modifyItem(); - if (tool != null) - this.craftResult.setInventorySlotContents(0, tool); + if (tool != null) this.craftResult.setInventorySlotContents(0, tool); else - this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); + this.craftResult.setInventorySlotContents( + 0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); } @Override public boolean canInteractWith(EntityPlayer player) { Block block = worldObj.getBlock(this.posX, this.posY, this.posZ); - if (block != TinkerTools.craftingStationWood && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.craftingStationWood && block != TinkerTools.craftingSlabWood) return false; if (!this.logic.isUseableByPlayer(player) || !CraftingStationLogic.isUseableByPlayer(player, this.inventories)) return false; - return player.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D; + return player.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) + <= 64.0D; } - protected boolean mergeCraftedStack(ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) { + protected boolean mergeCraftedStack( + ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) { boolean failedToMerge = false; int slotIndex = slotsStart; @@ -282,7 +285,7 @@ protected boolean mergeCraftedStack(ItemStack stack, int slotsStart, int slotsTo otherInventorySlot = (Slot) this.inventorySlots.get(slotIndex); copyStack = otherInventorySlot.getStack(); - if (copyStack == null) { + if (copyStack == null && otherInventorySlot.isItemValid(stack)) { otherInventorySlot.putStack(stack.copy()); otherInventorySlot.onSlotChanged(); stack.stackSize = 0; @@ -304,54 +307,53 @@ protected boolean mergeCraftedStack(ItemStack stack, int slotsStart, int slotsTo @Override protected boolean mergeItemStack(@Nonnull ItemStack stack, int startIndex, int endIndex, boolean useEndIndex) { boolean ret = mergeItemStackRefill(stack, startIndex, endIndex, useEndIndex); - if(stack.stackSize > 0) { + if (stack.stackSize > 0) { ret |= mergeItemStackMove(stack, startIndex, endIndex, useEndIndex); } return ret; } // only refills items that are already present - protected boolean mergeItemStackRefill(@Nonnull ItemStack stack, int startIndex, int endIndex, boolean useEndIndex) { - if(stack.stackSize <= 0) { + protected boolean mergeItemStackRefill( + @Nonnull ItemStack stack, int startIndex, int endIndex, boolean useEndIndex) { + if (stack.stackSize <= 0) { return false; } boolean didSomething = false; int k = useEndIndex ? endIndex - 1 : startIndex; - Slot slot; ItemStack itemstack1; - if(stack.isStackable()) { - while(stack.stackSize > 0 && (!useEndIndex && k < endIndex || useEndIndex && k >= startIndex)) { - slot = (Slot)this.inventorySlots.get(k); + if (stack.isStackable()) { + while (stack.stackSize > 0 && (!useEndIndex && k < endIndex || useEndIndex && k >= startIndex)) { + slot = (Slot) this.inventorySlots.get(k); itemstack1 = slot.getStack(); - if(itemstack1 != null - && itemstack1.getItem() == stack.getItem() - && (!stack.getHasSubtypes() || stack.getItemDamage() == itemstack1.getItemDamage()) - && ItemStack.areItemStackTagsEqual(stack, itemstack1) - && this.func_94530_a/*canMergeSlot*/(stack, slot)) { + if (itemstack1 != null + && itemstack1.getItem() == stack.getItem() + && (!stack.getHasSubtypes() || stack.getItemDamage() == itemstack1.getItemDamage()) + && ItemStack.areItemStackTagsEqual(stack, itemstack1) + && this.func_94530_a /*canMergeSlot*/(stack, slot)) { int l = itemstack1.stackSize + stack.stackSize; int limit = Math.min(stack.getMaxStackSize(), slot.getSlotStackLimit()); - if(l <= limit) { + if (l <= limit) { stack.stackSize = 0; itemstack1.stackSize = l; slot.onSlotChanged(); didSomething = true; - } - else if(itemstack1.stackSize < limit) { + } else if (itemstack1.stackSize < limit) { stack.stackSize -= (limit - itemstack1.stackSize); itemstack1.stackSize = limit; slot.onSlotChanged(); didSomething = true; } } - - if(useEndIndex) --k; - else ++k; + + if (useEndIndex) --k; + else ++k; } } @@ -360,43 +362,42 @@ else if(itemstack1.stackSize < limit) { // only moves items into empty slots protected boolean mergeItemStackMove(@Nonnull ItemStack stack, int startIndex, int endIndex, boolean useEndIndex) { - if(stack.stackSize <= 0) { + if (stack.stackSize <= 0) { return false; } boolean didSomething = false; int k = useEndIndex ? endIndex - 1 : startIndex; - while(!useEndIndex && k < endIndex || useEndIndex && k >= startIndex) { - final Slot slot = (Slot)this.inventorySlots.get(k); + while (!useEndIndex && k < endIndex || useEndIndex && k >= startIndex) { + final Slot slot = (Slot) this.inventorySlots.get(k); ItemStack itemstack1 = slot.getStack(); - if((itemstack1 == null || itemstack1.stackSize == 0) && slot.isItemValid(stack) && this.func_94530_a/*canMergeSlot*/(stack, slot)) { + if ((itemstack1 == null || itemstack1.stackSize == 0) + && slot.isItemValid(stack) + && this.func_94530_a /*canMergeSlot*/(stack, slot)) { // Forge: Make sure to respect isItemValid in the slot. int limit = slot.getSlotStackLimit(); ItemStack stack2 = stack.copy(); - if(stack2.stackSize > limit) { + if (stack2.stackSize > limit) { stack2.stackSize = limit; stack.stackSize -= limit; - } - else { + } else { stack.stackSize = 0; } slot.putStack(stack2); slot.onSlotChanged(); didSomething = true; - if(stack.stackSize <= 0) { + if (stack.stackSize <= 0) { break; } } - if(useEndIndex) --k; - else ++k; + if (useEndIndex) --k; + else ++k; } - + return didSomething; } - } - diff --git a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java index c9ff9c9e11d..062b7e59940 100644 --- a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -7,15 +7,13 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.FrypanLogic; -public class FrypanContainer extends Container -{ +public class FrypanContainer extends Container { public FrypanLogic logic; public int progress = 0; public int fuel = 0; public int fuelGague = 0; - public FrypanContainer(EntityPlayer player, FrypanLogic frypan) - { + public FrypanContainer(EntityPlayer player, FrypanLogic frypan) { InventoryPlayer inventoryplayer = player.inventory; logic = frypan; this.addSlotToContainer(new Slot(frypan, 1, 26, 45)); @@ -24,37 +22,30 @@ public FrypanContainer(EntityPlayer player, FrypanLogic frypan) this.addSlotToContainer(new SlotFrypan(frypan, 2 + x + y * 4, 70 + x * 18, 27 + y * 18, player)); /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); } } @Override - public void detectAndSendChanges () - { + public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < crafters.size(); i++) - { + for (int i = 0; i < crafters.size(); i++) { ICrafting icrafting = (ICrafting) crafters.get(i); - if (progress != logic.progress) - { + if (progress != logic.progress) { icrafting.sendProgressBarUpdate(this, 0, logic.progress); } - if (fuel != logic.fuel) - { + if (fuel != logic.fuel) { icrafting.sendProgressBarUpdate(this, 1, logic.fuel); } - if (fuelGague != logic.fuelGague) - { + if (fuelGague != logic.fuelGague) { icrafting.sendProgressBarUpdate(this, 2, logic.fuelGague); } } @@ -65,61 +56,46 @@ public void detectAndSendChanges () } @Override - public void updateProgressBar (int i, int j) - { - if (i == 0) - { + public void updateProgressBar(int i, int j) { + if (i == 0) { logic.progress = j; } - if (i == 1) - { + if (i == 1) { logic.fuel = j; } - if (i == 2) - { + if (i == 2) { logic.fuelGague = j; } } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.heldItemBlock) - return false; + if (block != TinkerTools.heldItemBlock) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < logic.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { + if (slotID < logic.getSizeInventory()) { + if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false)) - { + } else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false)) { return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index bbe39ad1498..1d3f501e13d 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -8,38 +8,32 @@ import net.minecraft.tileentity.TileEntityFurnace; import tconstruct.tools.logic.FurnaceLogic; -public class FurnaceContainer extends Container -{ +public class FurnaceContainer extends Container { private FurnaceLogic furnace; private int lastCookTime; private int lastBurnTime; private int lastItemBurnTime; - public FurnaceContainer(InventoryPlayer par1InventoryPlayer, FurnaceLogic par2TileEntityFurnace) - { + public FurnaceContainer(InventoryPlayer par1InventoryPlayer, FurnaceLogic par2TileEntityFurnace) { this.furnace = par2TileEntityFurnace; this.addSlotToContainer(new Slot(par2TileEntityFurnace, 0, 56, 17)); this.addSlotToContainer(new Slot(par2TileEntityFurnace, 1, 56, 53)); this.addSlotToContainer(new SlotFurnace(par1InventoryPlayer.player, par2TileEntityFurnace, 2, 116, 35)); int i; - for (i = 0; i < 3; ++i) - { - for (int j = 0; j < 9; ++j) - { + for (i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { this.addSlotToContainer(new Slot(par1InventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } } - for (i = 0; i < 9; ++i) - { + for (i = 0; i < 9; ++i) { this.addSlotToContainer(new Slot(par1InventoryPlayer, i, 8 + i * 18, 142)); } } @Override - public void addCraftingToCrafters (ICrafting par1ICrafting) - { + public void addCraftingToCrafters(ICrafting par1ICrafting) { super.addCraftingToCrafters(par1ICrafting); par1ICrafting.sendProgressBarUpdate(this, 0, this.furnace.progress); par1ICrafting.sendProgressBarUpdate(this, 1, this.furnace.fuel); @@ -50,26 +44,21 @@ public void addCraftingToCrafters (ICrafting par1ICrafting) * Looks for changes made in the container, sends them to every listener. */ @Override - public void detectAndSendChanges () - { + public void detectAndSendChanges() { super.detectAndSendChanges(); - for (int i = 0; i < this.crafters.size(); ++i) - { + for (int i = 0; i < this.crafters.size(); ++i) { ICrafting icrafting = (ICrafting) this.crafters.get(i); - if (this.lastCookTime != this.furnace.progress) - { + if (this.lastCookTime != this.furnace.progress) { icrafting.sendProgressBarUpdate(this, 0, this.furnace.progress); } - if (this.lastBurnTime != this.furnace.fuel) - { + if (this.lastBurnTime != this.furnace.fuel) { icrafting.sendProgressBarUpdate(this, 1, this.furnace.fuel); } - if (this.lastItemBurnTime != this.furnace.fuelGague) - { + if (this.lastItemBurnTime != this.furnace.fuelGague) { icrafting.sendProgressBarUpdate(this, 2, this.furnace.fuelGague); } } @@ -81,27 +70,22 @@ public void detectAndSendChanges () @Override @SideOnly(Side.CLIENT) - public void updateProgressBar (int par1, int par2) - { - if (par1 == 0) - { + public void updateProgressBar(int par1, int par2) { + if (par1 == 0) { this.furnace.progress = par2; } - if (par1 == 1) - { + if (par1 == 1) { this.furnace.fuel = par2; } - if (par1 == 2) - { + if (par1 == 2) { this.furnace.fuelGague = par2; } } @Override - public boolean canInteractWith (EntityPlayer par1EntityPlayer) - { + public boolean canInteractWith(EntityPlayer par1EntityPlayer) { return this.furnace.isUseableByPlayer(par1EntityPlayer); } @@ -110,69 +94,47 @@ public boolean canInteractWith (EntityPlayer par1EntityPlayer) * you will crash when someone does that. */ @Override - public ItemStack transferStackInSlot (EntityPlayer par1EntityPlayer, int par2) - { + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { ItemStack itemstack = null; Slot slot = (Slot) this.inventorySlots.get(par2); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if (par2 == 2) - { - if (!this.mergeItemStack(itemstack1, 3, 39, true)) - { + if (par2 == 2) { + if (!this.mergeItemStack(itemstack1, 3, 39, true)) { return null; } slot.onSlotChange(itemstack1, itemstack); - } - else if (par2 != 1 && par2 != 0) - { - if (FurnaceRecipes.smelting().getSmeltingResult(itemstack1) != null) - { - if (!this.mergeItemStack(itemstack1, 0, 1, false)) - { + } else if (par2 != 1 && par2 != 0) { + if (FurnaceRecipes.smelting().getSmeltingResult(itemstack1) != null) { + if (!this.mergeItemStack(itemstack1, 0, 1, false)) { return null; } - } - else if (TileEntityFurnace.isItemFuel(itemstack1)) - { - if (!this.mergeItemStack(itemstack1, 1, 2, false)) - { + } else if (TileEntityFurnace.isItemFuel(itemstack1)) { + if (!this.mergeItemStack(itemstack1, 1, 2, false)) { return null; } - } - else if (par2 >= 3 && par2 < 30) - { - if (!this.mergeItemStack(itemstack1, 30, 39, false)) - { + } else if (par2 >= 3 && par2 < 30) { + if (!this.mergeItemStack(itemstack1, 30, 39, false)) { return null; } - } - else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, 3, 30, false)) - { + } else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, 3, 30, false)) { return null; } - } - else if (!this.mergeItemStack(itemstack1, 3, 39, false)) - { + } else if (!this.mergeItemStack(itemstack1, 3, 39, false)) { return null; } - if (itemstack1.stackSize == 0) - { + if (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) - { + if (itemstack1.stackSize == itemstack.stackSize) { return null; } diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 41ba5f7d14e..ff5e5878822 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -5,8 +5,7 @@ import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -public class InventoryCraftingStation extends InventoryCrafting -{ +public class InventoryCraftingStation extends InventoryCrafting { /** the width of the crafting inventory */ private int inventoryWidth; @@ -15,10 +14,10 @@ public class InventoryCraftingStation extends InventoryCrafting * on_CraftMaxtrixChanged. */ private Container eventHandler; + private InventoryLogic logic; - public InventoryCraftingStation(Container par1Container, int size, int height, InventoryLogic logic) - { + public InventoryCraftingStation(Container par1Container, int size, int height, InventoryLogic logic) { super(par1Container, size, height); this.eventHandler = par1Container; this.inventoryWidth = size; @@ -29,45 +28,36 @@ public InventoryCraftingStation(Container par1Container, int size, int height, I * Returns the number of slots in the inventory. */ @Override - public int getSizeInventory () - { + public int getSizeInventory() { return 9; } @Override - public ItemStack getStackInSlot (int slot) - { + public ItemStack getStackInSlot(int slot) { // the 9 slots + 1 output slot that's not accessible, we therefore have to add 1 to the slot accessed - return slot >= this.getSizeInventory() ? null : logic.getStackInSlot(slot+1); + return slot >= this.getSizeInventory() ? null : logic.getStackInSlot(slot + 1); } @Override - public ItemStack getStackInRowAndColumn (int row, int column) - { - if (row >= 0 && row < this.inventoryWidth) - { + public ItemStack getStackInRowAndColumn(int row, int column) { + if (row >= 0 && row < this.inventoryWidth) { int k = row + column * this.inventoryWidth; return this.getStackInSlot(k); - } - else - { + } else { return null; } } - public String getInvName () - { + public String getInvName() { return "container.crafting"; } - public boolean isInvNameLocalized () - { + public boolean isInvNameLocalized() { return false; } @Override - public ItemStack getStackInSlotOnClosing (int par1) - { + public ItemStack getStackInSlotOnClosing(int par1) { return null; } @@ -76,36 +66,28 @@ public ItemStack getStackInSlotOnClosing (int par1) * (second arg) of items and returns them in a new stack. */ @Override - public ItemStack decrStackSize (int slotID, int par2) - { + public ItemStack decrStackSize(int slotID, int par2) { ItemStack stack = logic.getStackInSlot(slotID + 1); - if (stack != null) - { + if (stack != null) { ItemStack itemstack; - if (stack.stackSize <= par2) - { + if (stack.stackSize <= par2) { itemstack = stack.copy(); stack = null; logic.setInventorySlotContents(slotID + 1, null); this.eventHandler.onCraftMatrixChanged(this); return itemstack; - } - else - { + } else { itemstack = stack.splitStack(par2); - if (stack.stackSize == 0) - { + if (stack.stackSize == 0) { stack = null; } this.eventHandler.onCraftMatrixChanged(this); return itemstack; } - } - else - { + } else { return null; } } @@ -115,8 +97,7 @@ public ItemStack decrStackSize (int slotID, int par2) * crafting or armor sections). */ @Override - public void setInventorySlotContents (int slot, ItemStack itemstack) - { + public void setInventorySlotContents(int slot, ItemStack itemstack) { logic.setInventorySlotContents(slot + 1, itemstack); this.eventHandler.onCraftMatrixChanged(this); } @@ -126,8 +107,7 @@ public void setInventorySlotContents (int slot, ItemStack itemstack) * 64, possibly will be extended. *Isn't this more of a set than a get?* */ @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 64; } @@ -135,34 +115,26 @@ public int getInventoryStackLimit () * Called when an the contents of an Inventory change, usually */ @Override - public void markDirty () - { - } + public void markDirty() {} /** * Do not make give this method the name canInteractWith because it clashes * with Container */ @Override - public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) - { + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { return true; } - public void openChest () - { - } + public void openChest() {} - public void closeChest () - { - } + public void closeChest() {} /** * Returns true if automation is allowed to insert the given stack (ignoring * stack size) into the given slot. */ - public boolean isStackValidForSlot (int par1, ItemStack par2ItemStack) - { + public boolean isStackValidForSlot(int par1, ItemStack par2ItemStack) { return true; } } diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java index 4bb3d7543d5..87063f969a1 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStationResult.java @@ -5,12 +5,10 @@ import net.minecraft.item.ItemStack; import tconstruct.tools.logic.CraftingStationLogic; -public class InventoryCraftingStationResult extends InventoryCraftResult -{ +public class InventoryCraftingStationResult extends InventoryCraftResult { CraftingStationLogic logic; - public InventoryCraftingStationResult(CraftingStationLogic logic) - { + public InventoryCraftingStationResult(CraftingStationLogic logic) { this.logic = logic; } @@ -18,8 +16,7 @@ public InventoryCraftingStationResult(CraftingStationLogic logic) * Returns the number of slots in the inventory. */ @Override - public int getSizeInventory () - { + public int getSizeInventory() { return 1; } @@ -27,16 +24,14 @@ public int getSizeInventory () * Returns the stack in slot i */ @Override - public ItemStack getStackInSlot (int par1) - { - return logic.getStackInSlot(0);// this.stackResult[0]; + public ItemStack getStackInSlot(int par1) { + return logic.getStackInSlot(0); // this.stackResult[0]; } /** * Returns the name of the inventory. */ - public String getInvName () - { + public String getInvName() { return "Result"; } @@ -45,8 +40,7 @@ public String getInvName () * name, and translated into the player's language. Otherwise it will be * used directly. */ - public boolean isInvNameLocalized () - { + public boolean isInvNameLocalized() { return false; } @@ -55,17 +49,13 @@ public boolean isInvNameLocalized () * (second arg) of items and returns them in a new stack. */ @Override - public ItemStack decrStackSize (int par1, int par2) - { + public ItemStack decrStackSize(int par1, int par2) { ItemStack stack = logic.getStackInSlot(0); - if (stack != null) - { + if (stack != null) { ItemStack itemstack = stack; logic.setInventorySlotContents(0, null); return itemstack; - } - else - { + } else { return null; } } @@ -76,8 +66,7 @@ public ItemStack decrStackSize (int par1, int par2) * GUI. */ @Override - public ItemStack getStackInSlotOnClosing (int par1) - { + public ItemStack getStackInSlotOnClosing(int par1) { return null; } @@ -86,8 +75,7 @@ public ItemStack getStackInSlotOnClosing (int par1) * crafting or armor sections). */ @Override - public void setInventorySlotContents (int par1, ItemStack par2ItemStack) - { + public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { logic.setInventorySlotContents(0, par2ItemStack); } @@ -96,8 +84,7 @@ public void setInventorySlotContents (int par1, ItemStack par2ItemStack) * 64, possibly will be extended. *Isn't this more of a set than a get?* */ @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 64; } @@ -105,34 +92,26 @@ public int getInventoryStackLimit () * Called when an the contents of an Inventory change, usually */ @Override - public void markDirty () - { - } + public void markDirty() {} /** * Do not make give this method the name canInteractWith because it clashes * with Container */ @Override - public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) - { + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { return true; } - public void openChest () - { - } + public void openChest() {} - public void closeChest () - { - } + public void closeChest() {} /** * Returns true if automation is allowed to insert the given stack (ignoring * stack size) into the given slot. */ - public boolean isStackValidForSlot (int par1, ItemStack par2ItemStack) - { + public boolean isStackValidForSlot(int par1, ItemStack par2ItemStack) { return true; } } diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java index 990ba5c4030..2e505c776c1 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java @@ -12,8 +12,7 @@ import tconstruct.tools.logic.PartBuilderLogic; import tconstruct.tools.logic.PatternChestLogic; -public class PartCrafterChestContainer extends ActiveContainer -{ +public class PartCrafterChestContainer extends ActiveContainer { protected PatternChestLogic patternLogic; protected InventoryPlayer invPlayer; protected PartBuilderLogic logic; @@ -21,82 +20,73 @@ public class PartCrafterChestContainer extends ActiveContainer protected Slot[] inventory; public boolean largeInventory; - public PartCrafterChestContainer(InventoryPlayer inventoryplayer, PartBuilderLogic partLogic, PatternChestLogic pLogic) - { + public PartCrafterChestContainer( + InventoryPlayer inventoryplayer, PartBuilderLogic partLogic, PatternChestLogic pLogic) { logic = partLogic; patternLogic = pLogic; largeInventory = true; - inventory = new Slot[] { new SlotPattern(partLogic, 0, 156, 27), new SlotPattern(partLogic, 1, 156, 45), new Slot(partLogic, 2, 174, 27), new Slot(partLogic, 3, 174, 45), new SlotOnlyTake(partLogic, 4, 218, 27), new SlotOnlyTake(partLogic, 5, 236, 27), new SlotOnlyTake(partLogic, 6, 218, 45), new SlotOnlyTake(partLogic, 7, 236, 45) }; - for (int iter = 0; iter < inventory.length; iter++) - this.addSlotToContainer(inventory[iter]); + inventory = new Slot[] { + new SlotPattern(partLogic, 0, 156, 27), + new SlotPattern(partLogic, 1, 156, 45), + new Slot(partLogic, 2, 174, 27), + new Slot(partLogic, 3, 174, 45), + new SlotOnlyTake(partLogic, 4, 218, 27), + new SlotOnlyTake(partLogic, 5, 236, 27), + new SlotOnlyTake(partLogic, 6, 218, 45), + new SlotOnlyTake(partLogic, 7, 236, 45) + }; + for (int iter = 0; iter < inventory.length; iter++) this.addSlotToContainer(inventory[iter]); /* Holder inventory */ - for (int column = 0; column < 5; column++) - { - for (int row = 0; row < 6; row++) - { + for (int column = 0; column < 5; column++) { + for (int row = 0; row < 6; row++) { this.addSlotToContainer(new SlotPattern(pLogic, row + column * 6, 8 + row * 18, 30 + column * 18)); } } /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 124 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 124 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 124 + column * 18, 142)); } - } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); int inventorySize = this.inventory.length + this.patternLogic.getSizeInventory(); - if (slotID < inventorySize) - { - if (!this.mergeItemStack(slotStack, inventorySize, this.inventorySlots.size(), true)) - { + if (slotID < inventorySize) { + if (!this.mergeItemStack(slotStack, inventorySize, this.inventorySlots.size(), true)) { return null; } - } - else - { - if (slotStack.getItem() instanceof IPattern) - { + } else { + if (slotStack.getItem() instanceof IPattern) { if (!this.mergeItemStack(slotStack, 0, 2, false) && !this.mergeItemStack(slotStack, 8, 38, false)) return null; - } - else if (!this.mergeItemStack(slotStack, 2, 4, false)) - return null; + } else if (!this.mergeItemStack(slotStack, 2, 4, false)) return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack(null); logic.tryBuildPart(slotID); } diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java index 9f622c75d2e..070d338b8e4 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java @@ -10,80 +10,70 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.PartBuilderLogic; -public class PartCrafterContainer extends ActiveContainer -{ +public class PartCrafterContainer extends ActiveContainer { protected InventoryPlayer invPlayer; protected PartBuilderLogic logic; protected Slot[] input; protected Slot[] inventory; public boolean largeInventory; - public PartCrafterContainer(InventoryPlayer inventoryplayer, PartBuilderLogic partLogic) - { + public PartCrafterContainer(InventoryPlayer inventoryplayer, PartBuilderLogic partLogic) { invPlayer = inventoryplayer; logic = partLogic; largeInventory = false; - inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; - for (int iter = 0; iter < inventory.length; iter++) - this.addSlotToContainer(inventory[iter]); + inventory = new Slot[] { + new SlotPattern(partLogic, 0, 40, 27), + new SlotPattern(partLogic, 1, 40, 45), + new Slot(partLogic, 2, 58, 27), + new Slot(partLogic, 3, 58, 45), + new SlotOnlyTake(partLogic, 4, 102, 27), + new SlotOnlyTake(partLogic, 5, 120, 27), + new SlotOnlyTake(partLogic, 6, 102, 45), + new SlotOnlyTake(partLogic, 7, 120, 45) + }; + for (int iter = 0; iter < inventory.length; iter++) this.addSlotToContainer(inventory[iter]); /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); } - } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < logic.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { + if (slotID < logic.getSizeInventory()) { + if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } - else - { - if (slotStack.getItem() instanceof IPattern) - { - if (!this.mergeItemStack(slotStack, 0, 2, false)) - return null; - } - else if (!this.mergeItemStack(slotStack, 2, 4, false)) - return null; + } else { + if (slotStack.getItem() instanceof IPattern) { + if (!this.mergeItemStack(slotStack, 0, 2, false)) return null; + } else if (!this.mergeItemStack(slotStack, 2, 4, false)) return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack((ItemStack) null); logic.tryBuildPart(slotID); } diff --git a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index 66b87455040..c954f0bb11b 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -10,77 +10,60 @@ import tconstruct.tools.logic.PatternChestLogic; @ChestContainer -public class PatternChestContainer extends Container -{ +public class PatternChestContainer extends Container { public PatternChestLogic logic; public int progress = 0; public int fuel = 0; public int fuelGague = 0; - public PatternChestContainer(InventoryPlayer inventoryplayer, PatternChestLogic chest) - { + public PatternChestContainer(InventoryPlayer inventoryplayer, PatternChestLogic chest) { logic = chest; - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 10; row++) - { + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 10; row++) { this.addSlotToContainer(new SlotPattern(chest, row + column * 10, 8 + row * 18, 18 + column * 18)); } } /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 17 + row * 18, 86 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 17 + row * 18, 86 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 17 + column * 18, 144)); } } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < logic.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { + if (slotID < logic.getSizeInventory()) { + if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false)) - { + } else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false)) { return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } @@ -89,11 +72,9 @@ else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false)) } @Override - protected boolean mergeItemStack (ItemStack stack, int inventorySize, int slotSize, boolean par4) - { - if (!(stack.getItem() instanceof IPattern)) - return false; + protected boolean mergeItemStack(ItemStack stack, int inventorySize, int slotSize, boolean par4) { + if (!(stack.getItem() instanceof IPattern)) return false; return super.mergeItemStack(stack, inventorySize, slotSize, par4); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java index 04b071cafae..ebae404c9c4 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java @@ -8,12 +8,10 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.StencilTableLogic; -public class PatternShaperContainer extends Container -{ +public class PatternShaperContainer extends Container { public StencilTableLogic logic; - public PatternShaperContainer(InventoryPlayer inventoryplayer, StencilTableLogic shaper) - { + public PatternShaperContainer(InventoryPlayer inventoryplayer, StencilTableLogic shaper) { logic = shaper; this.addSlotToContainer(new Slot(shaper, 0, 48, 35)); this.addSlotToContainer(new SlotOnlyTake(shaper, 1, 106, 35)); @@ -26,16 +24,14 @@ public PatternShaperContainer(InventoryPlayer inventoryplayer, StencilTableLogic }*/ /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); } } @@ -61,17 +57,14 @@ public void onContainerClosed(EntityPlayer entityplayer) }*/ @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { return null; /*ItemStack stack = null; Slot slot = (Slot)this.inventorySlots.get(slotID); @@ -105,5 +98,4 @@ else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory()-1, false)) return stack;*/ } - -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java index cdf9cd34be2..b83720f0a8f 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java @@ -6,26 +6,34 @@ import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.AbilityHelper; -public class SlotCraftingStation extends SlotCrafting -{ +public class SlotCraftingStation extends SlotCrafting { private final IInventory matrix; private EntityPlayer player; - public SlotCraftingStation(EntityPlayer par1EntityPlayer, IInventory par2IInventory, IInventory par3iInventory, int par4, int par5, int par6) - { + public SlotCraftingStation( + EntityPlayer par1EntityPlayer, + IInventory par2IInventory, + IInventory par3iInventory, + int par4, + int par5, + int par6) { super(par1EntityPlayer, par2IInventory, par3iInventory, par4, par5, par6); this.matrix = par2IInventory; this.player = par1EntityPlayer; } @Override - public void onPickupFromSlot (EntityPlayer player, ItemStack stack) - { + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { ItemStack tool = this.matrix.getStackInSlot(4); - if (stack.getItem() instanceof IModifyable && tool != null && tool.getItem() instanceof IModifyable) - { + if (stack.getItem() instanceof IModifyable && tool != null && tool.getItem() instanceof IModifyable) { matrix.setInventorySlotContents(4, null); - player.worldObj.playSoundEffect(player.posX, player.posY, player.posZ, "tinker:little_saw", 1.0F, (AbilityHelper.random.nextFloat() - AbilityHelper.random.nextFloat()) * 0.2F + 1.0F); + player.worldObj.playSoundEffect( + player.posX, + player.posY, + player.posZ, + "tinker:little_saw", + 1.0F, + (AbilityHelper.random.nextFloat() - AbilityHelper.random.nextFloat()) * 0.2F + 1.0F); } super.onPickupFromSlot(player, stack); } diff --git a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java index ae73acb5d8b..93616278e94 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java +++ b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java @@ -6,31 +6,28 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.achievements.TAchievements; -public class SlotFrypan extends Slot -{ +public class SlotFrypan extends Slot { public EntityPlayer player; - public SlotFrypan(IInventory par1IInventory, int par2, int par3, int par4, EntityPlayer player) - { + public SlotFrypan(IInventory par1IInventory, int par2, int par3, int par4, EntityPlayer player) { super(par1IInventory, par2, par3, par4); this.player = player; } @Override - public void putStack (ItemStack par1ItemStack) - { + public void putStack(ItemStack par1ItemStack) { super.putStack(par1ItemStack); - if (par1ItemStack != null && par1ItemStack.getItem() != null && par1ItemStack.getItem() instanceof ItemFood && par1ItemStack.hasTagCompound()) - { + if (par1ItemStack != null + && par1ItemStack.getItem() != null + && par1ItemStack.getItem() instanceof ItemFood + && par1ItemStack.hasTagCompound()) { NBTTagCompound stackTagCompound = par1ItemStack.getTagCompound(); - if (stackTagCompound == null || !stackTagCompound.getBoolean("frypanKill")) - { + if (stackTagCompound == null || !stackTagCompound.getBoolean("frypanKill")) { return; } TAchievements.triggerAchievement(player, "tconstruct.dualConvenience"); } } - } diff --git a/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java index 662d10e8ea6..367f901ef5d 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java @@ -3,17 +3,12 @@ import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -public class SlotPartBuilder extends Slot -{ +public class SlotPartBuilder extends Slot { - public SlotPartBuilder(IInventory inv, int index, int posX, int posY) - { + public SlotPartBuilder(IInventory inv, int index, int posX, int posY) { super(inv, index, posX, posY); } @Override - protected void onCrafting (ItemStack par1ItemStack, int par2) - { - - } + protected void onCrafting(ItemStack par1ItemStack, int par2) {} } diff --git a/src/main/java/tconstruct/tools/inventory/SlotPattern.java b/src/main/java/tconstruct/tools/inventory/SlotPattern.java index 607c7a01295..066b8a82df7 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPattern.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPattern.java @@ -4,10 +4,8 @@ import net.minecraft.item.ItemStack; import tconstruct.library.util.IPattern; -public class SlotPattern extends Slot -{ - public SlotPattern(IInventory builder, int par3, int par4, int par5) - { +public class SlotPattern extends Slot { + public SlotPattern(IInventory builder, int par3, int par4, int par5) { super(builder, par3, par4, par5); } @@ -15,8 +13,7 @@ public SlotPattern(IInventory builder, int par3, int par4, int par5) * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override - public boolean isItemValid (ItemStack stack) - { + public boolean isItemValid(ItemStack stack) { return stack.getItem() instanceof IPattern; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java index 915a71ce91d..ec06b8840bf 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotTool.java +++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java @@ -9,16 +9,14 @@ import net.minecraftforge.common.MinecraftForge; import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; -import tconstruct.tools.logic.ToolStationLogic; -public class SlotTool extends Slot -{ +public class SlotTool extends Slot { /** The player that is using the GUI where this slot resides. */ public EntityPlayer player; + Random random = new Random(); - public SlotTool(EntityPlayer entityplayer, IInventory builder, int par3, int par4, int par5) - { + public SlotTool(EntityPlayer entityplayer, IInventory builder, int par3, int par4, int par5) { super(builder, par3, par4, par5); this.player = entityplayer; } @@ -26,16 +24,14 @@ public SlotTool(EntityPlayer entityplayer, IInventory builder, int par3, int par /** * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ - public boolean isItemValid (ItemStack stack) - { + public boolean isItemValid(ItemStack stack) { return false; - //return stack.getItem() instanceof ToolCore; + // return stack.getItem() instanceof ToolCore; } - public void onPickupFromSlot (EntityPlayer par1EntityPlayer, ItemStack stack) - { + public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack stack) { this.onCrafting(stack); - //stack.setUnlocalizedName("\u00A7f" + toolName); + // stack.setUnlocalizedName("\u00A7f" + toolName); super.onPickupFromSlot(par1EntityPlayer, stack); } @@ -43,38 +39,41 @@ public void onPickupFromSlot (EntityPlayer par1EntityPlayer, ItemStack stack) * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an * internal count then calls onCrafting(item). */ - protected void onCrafting (ItemStack stack, int par2) - { - //this.field_75228_b += par2; + protected void onCrafting(ItemStack stack, int par2) { + // this.field_75228_b += par2; this.onCrafting(stack); } /** * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. */ - protected void onCrafting (ItemStack stack) - { - if (stack.getItem() instanceof IModifyable) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + protected void onCrafting(ItemStack stack) { + if (stack.getItem() instanceof IModifyable) { + NBTTagCompound tags = + stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); Boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null); - for (int i = 2; i <= 3; i++) - inventory.decrStackSize(i, 1); + for (int i = 2; i <= 3; i++) inventory.decrStackSize(i, 1); ItemStack compare = inventory.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; inventory.decrStackSize(1, amount); if (!player.worldObj.isRemote && full) - player.worldObj.playSoundEffect(player.posX, player.posY, player.posZ, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); + player.worldObj.playSoundEffect( + player.posX, + player.posY, + player.posZ, + "tinker:little_saw", + 1.0F, + (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); - } - else - //Simply naming items + } else + // Simply naming items { int amount = inventory.getStackInSlot(1).stackSize; inventory.decrStackSize(1, amount); - for(int i = 0; i < inventory.getSizeInventory(); i++) { - if(inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getItem() == Items.name_tag) { + for (int i = 0; i < inventory.getSizeInventory(); i++) { + if (inventory.getStackInSlot(i) != null + && inventory.getStackInSlot(i).getItem() == Items.name_tag) { inventory.decrStackSize(i, 1); break; } diff --git a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java index 7fbac3a3df4..9894dc485a5 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java +++ b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java @@ -10,39 +10,37 @@ import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; -public class SlotToolForge extends SlotTool -{ +public class SlotToolForge extends SlotTool { /** The player that is using the GUI where this slot resides. */ Random random = new Random(); - public SlotToolForge(EntityPlayer entityplayer, IInventory builder, int par3, int par4, int par5) - { + public SlotToolForge(EntityPlayer entityplayer, IInventory builder, int par3, int par4, int par5) { super(entityplayer, builder, par3, par4, par5); } - protected void onCrafting (ItemStack stack) - { - if (stack.getItem() instanceof IModifyable) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null || inventory.getStackInSlot(4) != null); - for (int i = 2; i <= 4; i++) - inventory.decrStackSize(i, 1); + protected void onCrafting(ItemStack stack) { + if (stack.getItem() instanceof IModifyable) { + NBTTagCompound tags = + stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + Boolean full = (inventory.getStackInSlot(2) != null + || inventory.getStackInSlot(3) != null + || inventory.getStackInSlot(4) != null); + for (int i = 2; i <= 4; i++) inventory.decrStackSize(i, 1); ItemStack compare = inventory.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; inventory.decrStackSize(1, amount); if (!player.worldObj.isRemote && full) player.worldObj.playAuxSFX(1021, (int) player.posX, (int) player.posY, (int) player.posZ, 0); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); - } - else - //Simply naming items + } else + // Simply naming items { int amount = inventory.getStackInSlot(1).stackSize; inventory.decrStackSize(1, amount); - for(int i = 0; i < inventory.getSizeInventory(); i++) { - if(inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getItem() == Items.name_tag) { + for (int i = 0; i < inventory.getSizeInventory(); i++) { + if (inventory.getStackInSlot(i) != null + && inventory.getStackInSlot(i).getItem() == Items.name_tag) { inventory.decrStackSize(i, 1); break; } diff --git a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java index 6b5c3b40ae1..cf2ee3923f7 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java @@ -12,79 +12,73 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.*; -public class ToolForgeContainer extends ToolStationContainer -{ +public class ToolForgeContainer extends ToolStationContainer { - public ToolForgeContainer(InventoryPlayer inventoryplayer, ToolForgeLogic logic) - { + public ToolForgeContainer(InventoryPlayer inventoryplayer, ToolForgeLogic logic) { super(inventoryplayer, logic); } @Override - public void initializeContainer (InventoryPlayer inventoryplayer, ToolStationLogic builderlogic) - { + public void initializeContainer(InventoryPlayer inventoryplayer, ToolStationLogic builderlogic) { invPlayer = inventoryplayer; this.logic = builderlogic; toolSlot = new SlotToolForge(inventoryplayer.player, logic, 0, 225, 38); this.addSlotToContainer(toolSlot); - slots = new Slot[] { new Slot(logic, 1, 167, 29), new Slot(logic, 2, 169, 29), new Slot(logic, 3, 167, 47), new Slot(logic, 4, 149, 47) }; + slots = new Slot[] { + new Slot(logic, 1, 167, 29), + new Slot(logic, 2, 169, 29), + new Slot(logic, 3, 167, 47), + new Slot(logic, 4, 149, 47) + }; - for (int iter = 0; iter < 4; iter++) - this.addSlotToContainer(slots[iter]); + for (int iter = 0; iter < 4; iter++) this.addSlotToContainer(slots[iter]); /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 118 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 118 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 118 + column * 18, 142)); } } // posX and posY must be the same length @Override - public void resetSlots (int[] posX, int[] posY) - { + public void resetSlots(int[] posX, int[] posY) { inventorySlots.clear(); inventoryItemStacks.clear(); this.addSlotToContainer(toolSlot); - for (int iter = 0; iter < 4; iter++) - { + for (int iter = 0; iter < 4; iter++) { slots[iter].xDisplayPosition = posX[iter] + 111; slots[iter].yDisplayPosition = posY[iter] + 1; addSlotToContainer(slots[iter]); } - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { this.addSlotToContainer(new Slot(invPlayer, row + column * 9 + 9, 118 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(invPlayer, column, 118 + column * 18, 142)); } } @Override - protected void craftTool (ItemStack stack) - { - if (stack.getItem() instanceof IModifyable) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null || logic.getStackInSlot(4) != null); - for (int i = 2; i <= 4; i++) - logic.decrStackSize(i, 1); + protected void craftTool(ItemStack stack) { + if (stack.getItem() instanceof IModifyable) { + NBTTagCompound tags = + stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + Boolean full = (logic.getStackInSlot(2) != null + || logic.getStackInSlot(3) != null + || logic.getStackInSlot(4) != null); + for (int i = 2; i <= 4; i++) logic.decrStackSize(i, 1); ItemStack compare = logic.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; logic.decrStackSize(1, amount); @@ -92,17 +86,17 @@ protected void craftTool (ItemStack stack) if (!player.worldObj.isRemote && full) player.worldObj.playAuxSFX(1021, (int) player.posX, (int) player.posY, (int) player.posZ, 0); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.logic, player, stack)); - } - else - //Simply naming items + } else + // Simply naming items { ItemStack stack2 = logic.getStackInSlot(1); int amount = logic.getStackInSlot(1).stackSize; logic.decrStackSize(1, amount); - if(!ToolStationLogic.canRename(stack2.getTagCompound(), stack2)) { - for(int i = 0; i < logic.getSizeInventory(); i++) { - if(logic.getStackInSlot(i) != null && logic.getStackInSlot(i).getItem() == Items.name_tag) { + if (!ToolStationLogic.canRename(stack2.getTagCompound(), stack2)) { + for (int i = 0; i < logic.getSizeInventory(); i++) { + if (logic.getStackInSlot(i) != null + && logic.getStackInSlot(i).getItem() == Items.name_tag) { logic.decrStackSize(i, 1); break; } @@ -112,11 +106,9 @@ protected void craftTool (ItemStack stack) } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.toolForge && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.toolForge && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } } diff --git a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index c8d28862b97..77333dfbf05 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -14,119 +14,98 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.ToolStationLogic; -public class ToolStationContainer extends ActiveContainer -{ +public class ToolStationContainer extends ActiveContainer { public InventoryPlayer invPlayer; public ToolStationLogic logic; public Slot[] slots; public SlotTool toolSlot; public Random random = new Random(); - public ToolStationContainer(InventoryPlayer inventoryplayer, ToolStationLogic builderlogic) - { + public ToolStationContainer(InventoryPlayer inventoryplayer, ToolStationLogic builderlogic) { initializeContainer(inventoryplayer, builderlogic); } - public void initializeContainer (InventoryPlayer inventoryplayer, ToolStationLogic builderlogic) - { + public void initializeContainer(InventoryPlayer inventoryplayer, ToolStationLogic builderlogic) { invPlayer = inventoryplayer; logic = builderlogic; toolSlot = new SlotTool(inventoryplayer.player, builderlogic, 0, 225, 38); this.addSlotToContainer(toolSlot); - slots = new Slot[] { new Slot(builderlogic, 1, 167, 29), new Slot(builderlogic, 2, 149, 38), new Slot(builderlogic, 3, 167, 47) }; + slots = new Slot[] { + new Slot(builderlogic, 1, 167, 29), new Slot(builderlogic, 2, 149, 38), new Slot(builderlogic, 3, 167, 47) + }; - for (int iter = 0; iter < 3; iter++) - this.addSlotToContainer(slots[iter]); + for (int iter = 0; iter < 3; iter++) this.addSlotToContainer(slots[iter]); /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 118 + row * 18, 84 + column * 18)); + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { + this.addSlotToContainer( + new Slot(inventoryplayer, row + column * 9 + 9, 118 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(inventoryplayer, column, 118 + column * 18, 142)); } } // posX and posY must be the same length - public void resetSlots (int[] posX, int[] posY) - { + public void resetSlots(int[] posX, int[] posY) { /* Station inventory */ inventorySlots.clear(); inventoryItemStacks.clear(); this.addSlotToContainer(toolSlot); - for (int iter = 0; iter < 3; iter++) - { + for (int iter = 0; iter < 3; iter++) { slots[iter].xDisplayPosition = posX[iter] + 111; slots[iter].yDisplayPosition = posY[iter] + 1; addSlotToContainer(slots[iter]); } /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { + for (int column = 0; column < 3; column++) { + for (int row = 0; row < 9; row++) { this.addSlotToContainer(new Slot(invPlayer, row + column * 9 + 9, 118 + row * 18, 84 + column * 18)); } } - for (int column = 0; column < 9; column++) - { + for (int column = 0; column < 9; column++) { this.addSlotToContainer(new Slot(invPlayer, column, 118 + column * 18, 142)); } } @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { + public boolean canInteractWith(EntityPlayer entityplayer) { Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); - if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) - return false; + if (block != TinkerTools.toolStationWood && block != TinkerTools.craftingSlabWood) return false; return logic.isUseableByPlayer(entityplayer); } @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { ItemStack stack = null; Slot slot = (Slot) this.inventorySlots.get(slotID); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack slotStack = slot.getStack(); stack = slotStack.copy(); - if (slotID < logic.getSizeInventory()) - { - if (slotID == 0) - { - if (!this.mergeCraftedStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true, player)) - { + if (slotID < logic.getSizeInventory()) { + if (slotID == 0) { + if (!this.mergeCraftedStack( + slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true, player)) { return null; } - } - else if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { + } else if (!this.mergeItemStack( + slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(slotStack, 1, logic.getSizeInventory(), false)) - { + } else if (!this.mergeItemStack(slotStack, 1, logic.getSizeInventory(), false)) { return null; } - if (slotStack.stackSize == 0) - { + if (slotStack.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } @@ -134,32 +113,36 @@ else if (!this.mergeItemStack(slotStack, 1, logic.getSizeInventory(), false)) return stack; } - protected void craftTool (ItemStack stack) - { - if (stack.getItem() instanceof IModifyable) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); + protected void craftTool(ItemStack stack) { + if (stack.getItem() instanceof IModifyable) { + NBTTagCompound tags = + stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); Boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null); - for (int i = 2; i <= 3; i++) - logic.decrStackSize(i, 1); + for (int i = 2; i <= 3; i++) logic.decrStackSize(i, 1); ItemStack compare = logic.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; logic.decrStackSize(1, amount); EntityPlayer player = invPlayer.player; if (!player.worldObj.isRemote && full) - player.worldObj.playSoundEffect(logic.xCoord, logic.yCoord, logic.zCoord, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); + player.worldObj.playSoundEffect( + logic.xCoord, + logic.yCoord, + logic.zCoord, + "tinker:little_saw", + 1.0F, + (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.logic, player, stack)); - } - else - //Simply naming items + } else + // Simply naming items { ItemStack stack2 = logic.getStackInSlot(1); int amount = logic.getStackInSlot(1).stackSize; logic.decrStackSize(1, amount); - if(!ToolStationLogic.canRename(stack2.getTagCompound(), stack2)) { - for(int i = 0; i < logic.getSizeInventory(); i++) { - if(logic.getStackInSlot(i) != null && logic.getStackInSlot(i).getItem() == Items.name_tag) { + if (!ToolStationLogic.canRename(stack2.getTagCompound(), stack2)) { + for (int i = 0; i < logic.getSizeInventory(); i++) { + if (logic.getStackInSlot(i) != null + && logic.getStackInSlot(i).getItem() == Items.name_tag) { logic.decrStackSize(i, 1); break; } @@ -168,37 +151,30 @@ protected void craftTool (ItemStack stack) } } - protected boolean mergeCraftedStack (ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) - { + protected boolean mergeCraftedStack( + ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) { boolean failedToMerge = false; int slotIndex = slotsStart; - if (playerInventory) - { + if (playerInventory) { slotIndex = slotsTotal - 1; } Slot otherInventorySlot; ItemStack copyStack = null; - if (stack.stackSize > 0) - { - if (playerInventory) - { + if (stack.stackSize > 0) { + if (playerInventory) { slotIndex = slotsTotal - 1; - } - else - { + } else { slotIndex = slotsStart; } - while (!playerInventory && slotIndex < slotsTotal || playerInventory && slotIndex >= slotsStart) - { + while (!playerInventory && slotIndex < slotsTotal || playerInventory && slotIndex >= slotsStart) { otherInventorySlot = (Slot) this.inventorySlots.get(slotIndex); copyStack = otherInventorySlot.getStack(); - if (copyStack == null) - { + if (copyStack == null) { craftTool(stack); otherInventorySlot.putStack(stack.copy()); otherInventorySlot.onSlotChanged(); @@ -207,12 +183,9 @@ protected boolean mergeCraftedStack (ItemStack stack, int slotsStart, int slotsT break; } - if (playerInventory) - { + if (playerInventory) { --slotIndex; - } - else - { + } else { ++slotIndex; } } diff --git a/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java index 8146e479c90..9faec63b564 100644 --- a/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java @@ -5,23 +5,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -public class CraftingSlabItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge" }; +public class CraftingSlabItemBlock extends MultiItemBlock { + public static final String blockTypes[] = { + "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge" + }; - public CraftingSlabItemBlock(Block b) - { + public CraftingSlabItemBlock(Block b) { super(b, "ToolStation", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public String getUnlocalizedName (ItemStack itemstack) - { + public String getUnlocalizedName(ItemStack itemstack) { int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockTypes.length - 1); - if (pos == 0 || pos == 5) - { + if (pos == 0 || pos == 5) { return this.blockTypes[pos]; } return super.getUnlocalizedName(itemstack); diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index 6a85687e559..2417c59fe60 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -8,12 +8,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -public class MultiBrickFancyItem extends MultiItemBlock -{ - static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone", "stone.road" }; +public class MultiBrickFancyItem extends MultiItemBlock { + static String blockTypes[] = { + "obsidian", + "sandstone", + "netherrack", + "stone.refined", + "iron", + "gold", + "lapis", + "diamond", + "redstone", + "bone", + "slime", + "blueslime", + "endstone", + "obsidian.ingot", + "stone", + "stone.road" + }; - public MultiBrickFancyItem(Block b) - { + public MultiBrickFancyItem(Block b) { super(b, "block.fancybrick", blockTypes); setMaxDamage(0); setHasSubtypes(true); @@ -21,25 +36,23 @@ public MultiBrickFancyItem(Block b) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 5: - case 6: - list.add(StatCollector.translateToLocal("fancybrick1.tooltip")); - break; - case 7: - list.add(StatCollector.translateToLocal("fancybrick2.tooltip")); - break; - case 8: - list.add(StatCollector.translateToLocal("fancybrick3.tooltip")); - list.add(StatCollector.translateToLocal("fancybrick4.tooltip")); - break; - case 10: - case 11: - list.add(StatCollector.translateToLocal("fancybrick5.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 5: + case 6: + list.add(StatCollector.translateToLocal("fancybrick1.tooltip")); + break; + case 7: + list.add(StatCollector.translateToLocal("fancybrick2.tooltip")); + break; + case 8: + list.add(StatCollector.translateToLocal("fancybrick3.tooltip")); + list.add(StatCollector.translateToLocal("fancybrick4.tooltip")); + break; + case 10: + case 11: + list.add(StatCollector.translateToLocal("fancybrick5.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index c41264e04f8..fcdc6049319 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -8,12 +8,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -public class MultiBrickItem extends MultiItemBlock -{ - static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone.road", "stone.refined.road" }; +public class MultiBrickItem extends MultiItemBlock { + static String blockTypes[] = { + "obsidian", + "sandstone", + "netherrack", + "stone.refined", + "iron", + "gold", + "lapis", + "diamond", + "redstone", + "bone", + "slime", + "blueslime", + "endstone", + "obsidian.ingot", + "stone.road", + "stone.refined.road" + }; - public MultiBrickItem(Block b) - { + public MultiBrickItem(Block b) { super(b, "block.brick", blockTypes); setMaxDamage(0); setHasSubtypes(true); @@ -21,25 +36,23 @@ public MultiBrickItem(Block b) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 5: - case 6: - list.add(StatCollector.translateToLocal("brick1.tooltip")); - break; - case 7: - list.add(StatCollector.translateToLocal("brick2.tooltip")); - break; - case 8: - list.add(StatCollector.translateToLocal("brick3.tooltip")); - list.add(StatCollector.translateToLocal("brick4.tooltip")); - break; - case 10: - case 11: - list.add(StatCollector.translateToLocal("brick5.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 5: + case 6: + list.add(StatCollector.translateToLocal("brick1.tooltip")); + break; + case 7: + list.add(StatCollector.translateToLocal("brick2.tooltip")); + break; + case 8: + list.add(StatCollector.translateToLocal("brick3.tooltip")); + list.add(StatCollector.translateToLocal("brick4.tooltip")); + break; + case 10: + case 11: + list.add(StatCollector.translateToLocal("brick5.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java index e673d38d77c..ead84820c30 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java @@ -4,10 +4,18 @@ import net.minecraft.block.Block; public class MultiBrickMetalItem extends MultiItemBlock { - static String blockTypes[] = { "brick.alumite", "brick.ardite", "brick.cobalt", "brick.manyullyn", "fancybrick.alumite", "fancybrick.ardite", "fancybrick.cobalt", "fancybrick.manyullyn" }; + static String blockTypes[] = { + "brick.alumite", + "brick.ardite", + "brick.cobalt", + "brick.manyullyn", + "fancybrick.alumite", + "fancybrick.ardite", + "fancybrick.cobalt", + "fancybrick.manyullyn" + }; - public MultiBrickMetalItem(Block b) - { + public MultiBrickMetalItem(Block b) { super(b, "block", blockTypes); setMaxDamage(0); setHasSubtypes(true); diff --git a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java index 2c22eb329f8..24ba5ad4270 100644 --- a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java @@ -3,12 +3,26 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class ToolStationItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "Crafter", "Parts", "Parts", "Parts", "Parts", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternShaper", "PatternShaper", "PatternShaper", "PatternShaper", "CastingTable" }; +public class ToolStationItemBlock extends MultiItemBlock { + public static final String blockTypes[] = { + "Crafter", + "Parts", + "Parts", + "Parts", + "Parts", + "PatternChest", + "PatternChest", + "PatternChest", + "PatternChest", + "PatternChest", + "PatternShaper", + "PatternShaper", + "PatternShaper", + "PatternShaper", + "CastingTable" + }; - public ToolStationItemBlock(Block b) - { + public ToolStationItemBlock(Block b) { super(b, "ToolStation", blockTypes); setMaxDamage(0); setHasSubtypes(true); diff --git a/src/main/java/tconstruct/tools/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java index 8ea51e2beb9..d5bf36fd5ba 100644 --- a/src/main/java/tconstruct/tools/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -9,47 +9,36 @@ import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; -public class Bowstring extends CraftingItem implements IToolPart -{ - public Bowstring() - { +public class Bowstring extends CraftingItem implements IToolPart { + public Bowstring() { super(toolMaterialNames, buildTextureNames("_bowstring"), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); } - private static String[] buildTextureNames (String textureType) - { + private static String[] buildTextureNames(String textureType) { String[] names = new String[toolMaterialNames.length]; - for (int i = 0; i < toolMaterialNames.length; i++) - { - if (toolTextureNames[i].equals("")) - names[i] = ""; - else - names[i] = toolTextureNames[i] + textureType; + for (int i = 0; i < toolMaterialNames.length; i++) { + if (toolTextureNames[i].equals("")) names[i] = ""; + else names[i] = toolTextureNames[i] + textureType; } return names; } - public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric", "flamestring" }; + public static final String[] toolMaterialNames = new String[] {"string", "enchantedfabric", "flamestring"}; - public static final String[] toolTextureNames = new String[] { "string", "magicfabric", "flamestring" }; + public static final String[] toolTextureNames = new String[] {"string", "magicfabric", "flamestring"}; @Override - public int getMaterialID (ItemStack stack) - { - if (stack.getItemDamage() >= toolMaterialNames.length) - return -1; + public int getMaterialID(ItemStack stack) { + if (stack.getItemDamage() >= toolMaterialNames.length) return -1; return stack.getItemDamage(); } @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { + public void getSubItems(Item b, CreativeTabs tab, List list) { list.add(new ItemStack(b, 1, 0)); - if (TinkerTools.thaumcraftAvailable) - list.add(new ItemStack(b, 1, 1)); - if (Loader.isModLoaded("Natura")) - list.add(new ItemStack(b, 1, 2)); + if (TinkerTools.thaumcraftAvailable) list.add(new ItemStack(b, 1, 1)); + if (Loader.isModLoaded("Natura")) list.add(new ItemStack(b, 1, 2)); } } diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index e684c28d948..efc9aa35c10 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -12,11 +12,9 @@ import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; -public class CreativeModifier extends Item -{ +public class CreativeModifier extends Item { - public CreativeModifier() - { + public CreativeModifier() { super(); this.setCreativeTab(TConstructRegistry.materialTab); } @@ -26,12 +24,10 @@ public CreativeModifier() * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) */ @Override - public void getSubItems (Item par1, CreativeTabs par2CreativeTabs, List par3List) - { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); - for (ToolRecipe recipe : ToolBuilder.instance.combos) - { + for (ToolRecipe recipe : ToolBuilder.instance.combos) { ToolCore tool = recipe.getType(); ItemStack item = new ItemStack(par1, 1, 0); NBTTagCompound compound = new NBTTagCompound(); @@ -44,21 +40,18 @@ public void getSubItems (Item par1, CreativeTabs par2CreativeTabs, List par3List @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon("tinker:skull_char_gold"); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.hasTagCompound()) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (stack.hasTagCompound()) { String targetLock = "None"; targetLock = stack.getTagCompound().getString("TargetLock"); targetLock = StatCollector.translateToLocal("infitool." + targetLock.toLowerCase()); list.add(StatCollector.translateToLocal("creativeModLock.tooltip") + targetLock); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/items/Fletching.java b/src/main/java/tconstruct/tools/items/Fletching.java index 0704f331677..c17b47b4d7e 100644 --- a/src/main/java/tconstruct/tools/items/Fletching.java +++ b/src/main/java/tconstruct/tools/items/Fletching.java @@ -5,37 +5,30 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; -public class Fletching extends CraftingItem implements IToolPart -{ - public Fletching() - { +public class Fletching extends CraftingItem implements IToolPart { + public Fletching() { super(toolMaterialNames, buildTextureNames("_fletching"), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); } - private static String[] buildTextureNames (String textureType) - { + private static String[] buildTextureNames(String textureType) { String[] names = new String[toolMaterialNames.length]; - for (int i = 0; i < toolMaterialNames.length; i++) - { - if (toolTextureNames[i].equals("")) - names[i] = ""; - else - names[i] = toolTextureNames[i] + textureType; + for (int i = 0; i < toolMaterialNames.length; i++) { + if (toolTextureNames[i].equals("")) names[i] = ""; + else names[i] = toolTextureNames[i] + textureType; } return names; } - public static final String[] toolMaterialNames = new String[] { "feather", "leaf", "slime", "blueslime", "slimeleaf" }; + public static final String[] toolMaterialNames = + new String[] {"feather", "leaf", "slime", "blueslime", "slimeleaf"}; - public static final String[] toolTextureNames = new String[] { "feather", "leaf", "slime", "blueslime", "slimeleaf" }; + public static final String[] toolTextureNames = new String[] {"feather", "leaf", "slime", "blueslime", "slimeleaf"}; @Override - public int getMaterialID (ItemStack stack) - { - if (stack.getItemDamage() >= toolMaterialNames.length) - return -1; + public int getMaterialID(ItemStack stack) { + if (stack.getItemDamage() >= toolMaterialNames.length) return -1; return stack.getItemDamage(); } } diff --git a/src/main/java/tconstruct/tools/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java index ac16320abb5..51e64061b50 100644 --- a/src/main/java/tconstruct/tools/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -1,14 +1,12 @@ package tconstruct.tools.items; import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.*; import java.util.List; import mantle.books.BookData; import mantle.client.gui.GuiManual; import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -17,24 +15,22 @@ import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; -public class Manual extends CraftingItem -{ - static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary", "weaponry" }; - static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue", "tinkerbook_green" }; +public class Manual extends CraftingItem { + static String[] name = new String[] {"beginner", "toolstation", "smeltery", "diary", "weaponry"}; + static String[] textureName = new String[] { + "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue", "tinkerbook_green" + }; - public Manual() - { + public Manual() { super(name, textureName, "", "tinker", TConstructRegistry.materialTab); setUnlocalizedName("tconstruct.manual"); - } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { TAchievements.triggerAchievement(player, "tconstruct.beginner"); - if(world.isRemote) { + if (world.isRemote) { openBook(stack, world, player); } return stack; @@ -46,45 +42,40 @@ public void openBook(ItemStack stack, World world, EntityPlayer player) { FMLClientHandler.instance().displayGuiScreen(player, new GuiManual(stack, getData(stack))); } - - private BookData getData (ItemStack stack) - { - switch (stack.getItemDamage()) - { - case 0: - return TProxyClient.manualData.beginner; - case 1: - return TProxyClient.manualData.toolStation; - case 2: - return TProxyClient.manualData.smeltery; - case 4: - return TProxyClient.manualData.weaponry; - default: - return TProxyClient.manualData.diary; + private BookData getData(ItemStack stack) { + switch (stack.getItemDamage()) { + case 0: + return TProxyClient.manualData.beginner; + case 1: + return TProxyClient.manualData.toolStation; + case 2: + return TProxyClient.manualData.smeltery; + case 4: + return TProxyClient.manualData.weaponry; + default: + return TProxyClient.manualData.diary; } } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 0: - list.add("\u00a7o" + StatCollector.translateToLocal("manual1.tooltip")); - break; - case 1: - list.add("\u00a7o" + StatCollector.translateToLocal("manual2.tooltip")); - break; - case 2: - list.add("\u00a7o" + StatCollector.translateToLocal("manual3.tooltip")); - break; - case 4: - list.add("\u00a7o" + StatCollector.translateToLocal("manual4.tooltip")); - break; - default: - list.add("\u00a7o" + StatCollector.translateToLocal("manual5.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 0: + list.add("\u00a7o" + StatCollector.translateToLocal("manual1.tooltip")); + break; + case 1: + list.add("\u00a7o" + StatCollector.translateToLocal("manual2.tooltip")); + break; + case 2: + list.add("\u00a7o" + StatCollector.translateToLocal("manual3.tooltip")); + break; + case 4: + list.add("\u00a7o" + StatCollector.translateToLocal("manual4.tooltip")); + break; + default: + list.add("\u00a7o" + StatCollector.translateToLocal("manual5.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/tools/items/ManualInfo.java b/src/main/java/tconstruct/tools/items/ManualInfo.java index e97f2e2f8d7..09c9ef9af25 100644 --- a/src/main/java/tconstruct/tools/items/ManualInfo.java +++ b/src/main/java/tconstruct/tools/items/ManualInfo.java @@ -7,10 +7,10 @@ import org.w3c.dom.Document; import tconstruct.client.TProxyClient; -public class ManualInfo -{ +public class ManualInfo { // static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" }; - // static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue" }; + // static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", + // "tinkerbook_smeltery", "tinkerbook_blue" }; BookData beginner = new BookData(); BookData toolStation = new BookData(); @@ -23,19 +23,42 @@ public class ManualInfo volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory); smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory);*/ - public ManualInfo() - { + public ManualInfo() { Side side = FMLCommonHandler.instance().getEffectiveSide(); - beginner = initManual(beginner, "tconstruct.manual.beginner", "\u00a7o" + StatCollector.translateToLocal("manual1.tooltip"), side == Side.CLIENT ? TProxyClient.volume1 : null, "tinker:tinkerbook_diary"); - toolStation = initManual(toolStation, "tconstruct.manual.toolstation", "\u00a7o" + StatCollector.translateToLocal("manual2.tooltip"), side == Side.CLIENT ? TProxyClient.volume2 : null, "tinker:tinkerbook_toolstation"); - smeltery = initManual(smeltery, "tconstruct.manual.smeltery", "\u00a7o" + StatCollector.translateToLocal("manual3.tooltip"), side == Side.CLIENT ? TProxyClient.smelter : null, "tinker:tinkerbook_smeltery"); - diary = initManual(diary, "tconstruct.manual.diary", "\u00a7o" + StatCollector.translateToLocal("manual4.tooltip"), side == Side.CLIENT ? TProxyClient.diary : null, "tinker:tinkerbook_blue"); - weaponry = initManual(weaponry, "tconstruct.manual.weaponry", "\u00a7o" + StatCollector.translateToLocal("manual5.tooltip"), side == Side.CLIENT ? TProxyClient.weaponry : null, "tinker:tinkerbook_green"); + beginner = initManual( + beginner, + "tconstruct.manual.beginner", + "\u00a7o" + StatCollector.translateToLocal("manual1.tooltip"), + side == Side.CLIENT ? TProxyClient.volume1 : null, + "tinker:tinkerbook_diary"); + toolStation = initManual( + toolStation, + "tconstruct.manual.toolstation", + "\u00a7o" + StatCollector.translateToLocal("manual2.tooltip"), + side == Side.CLIENT ? TProxyClient.volume2 : null, + "tinker:tinkerbook_toolstation"); + smeltery = initManual( + smeltery, + "tconstruct.manual.smeltery", + "\u00a7o" + StatCollector.translateToLocal("manual3.tooltip"), + side == Side.CLIENT ? TProxyClient.smelter : null, + "tinker:tinkerbook_smeltery"); + diary = initManual( + diary, + "tconstruct.manual.diary", + "\u00a7o" + StatCollector.translateToLocal("manual4.tooltip"), + side == Side.CLIENT ? TProxyClient.diary : null, + "tinker:tinkerbook_blue"); + weaponry = initManual( + weaponry, + "tconstruct.manual.weaponry", + "\u00a7o" + StatCollector.translateToLocal("manual5.tooltip"), + side == Side.CLIENT ? TProxyClient.weaponry : null, + "tinker:tinkerbook_green"); } - public BookData initManual (BookData data, String unlocName, String toolTip, Document xmlDoc, String itemImage) - { - //proxy.readManuals(); + public BookData initManual(BookData data, String unlocName, String toolTip, Document xmlDoc, String itemImage) { + // proxy.readManuals(); data.unlocalizedName = unlocName; data.toolTip = unlocName; data.modID = "TConstruct"; @@ -44,5 +67,4 @@ public BookData initManual (BookData data, String unlocName, String toolTip, Doc BookDataStore.addBook(data); return data; } - } diff --git a/src/main/java/tconstruct/tools/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java index fc82c963b84..8ba1a2e0b82 100644 --- a/src/main/java/tconstruct/tools/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -3,28 +3,110 @@ import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; -public class MaterialItem extends CraftingItem -{ +public class MaterialItem extends CraftingItem { - public MaterialItem() - { + public MaterialItem() { super(materialNames, getTextures(), "materials/", "tinker", TConstructRegistry.materialTab); } - private static String[] getTextures () - { + private static String[] getTextures() { String[] names = new String[craftingTextures.length]; - for (int i = 0; i < craftingTextures.length; i++) - { - if (craftingTextures[i].equals("")) - names[i] = ""; - else - names[i] = "material_" + craftingTextures[i]; + for (int i = 0; i < craftingTextures.length; i++) { + if (craftingTextures[i].equals("")) names[i] = ""; + else names[i] = "material_" + craftingTextures[i]; } return names; } - static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick", "ArditeDust", "CobaltDust", "AluminumDust", "ManyullynDust", "AluBrassDust" }; + static String[] materialNames = new String[] { + "PaperStack", + "SlimeCrystal", + "SearedBrick", + "CobaltIngot", + "ArditeIngot", + "ManyullynIngot", + "Mossball", + "LavaCrystal", + "NecroticBone", + "CopperIngot", + "TinIngot", + "AluminumIngot", + "RawAluminum", + "BronzeIngot", + "AluBrassIngot", + "AlumiteIngot", + "SteelIngot", + "BlueSlimeCrystal", + "ObsidianIngot", + "IronNugget", + "CopperNugget", + "TinNugget", + "AluminumNugget", + "EssenceCrystal", + "AluBrassNugget", + "SilkyCloth", + "SilkyJewel", + "ObsidianNugget", + "CobaltNugget", + "ArditeNugget", + "ManyullynNugget", + "BronzeNugget", + "AlumiteNugget", + "SteelNugget", + "PigIronIngot", + "PigIronNugget", + "GlueBall", + "SearedBrick", + "ArditeDust", + "CobaltDust", + "AluminumDust", + "ManyullynDust", + "AluBrassDust" + }; - static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", "nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball", "searedbrick_nether", "ardite_dust", "cobalt_dust", "aluminum_dust", "manyullyn_dust", "alubrass_dust" }; + static String[] craftingTextures = new String[] { + "paperstack", + "slimecrystal", + "searedbrick", + "cobaltingot", + "arditeingot", + "manyullyningot", + "mossball", + "lavacrystal", + "necroticbone", + "copperingot", + "tiningot", + "aluminumingot", + "aluminumraw", + "bronzeingot", + "alubrassingot", + "alumiteingot", + "steelingot", + "blueslimecrystal", + "obsidianingot", + "nugget_iron", + "nugget_copper", + "nugget_tin", + "nugget_aluminum", + "", + "nugget_alubrass", + "silkycloth", + "silkyjewel", + "nugget_obsidian", + "nugget_cobalt", + "nugget_ardite", + "nugget_manyullyn", + "nugget_bronze", + "nugget_alumite", + "nugget_steel", + "pigironingot", + "nugget_pigiron", + "glueball", + "searedbrick_nether", + "ardite_dust", + "cobalt_dust", + "aluminum_dust", + "manyullyn_dust", + "alubrass_dust" + }; } diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index 06368189ec4..ff6e5977b77 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -1,11 +1,9 @@ package tconstruct.tools.items; import cpw.mods.fml.relauncher.*; - import java.util.HashMap; import java.util.List; import java.util.Map; - import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,15 +13,12 @@ import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; -public class Pattern extends CraftingItem implements IPattern -{ - public Pattern(String patternType, String folder) - { +public class Pattern extends CraftingItem implements IPattern { + public Pattern(String patternType, String folder) { this(patternName, getPatternNames(patternType), folder); } - public Pattern(String[] names, String[] patternTypes, String folder) - { + public Pattern(String[] names, String[] patternTypes, String folder) { super(names, patternTypes, folder, "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); @@ -31,31 +26,53 @@ public Pattern(String[] names, String[] patternTypes, String folder) this.setMaxStackSize(1); } - protected static String[] getPatternNames (String partType) - { + protected static String[] getPatternNames(String partType) { String[] names = new String[patternName.length]; - for (int i = 0; i < patternName.length; i++) - names[i] = partType + patternName[i]; + for (int i = 0; i < patternName.length; i++) names[i] = partType + patternName[i]; return names; } - private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; + private static final String[] patternName = new String[] { + "ingot", + "rod", + "pickaxe", + "shovel", + "axe", + "swordblade", + "largeguard", + "mediumguard", + "crossbar", + "binding", + "frypan", + "sign", + "knifeblade", + "chisel", + "largerod", + "toughbinding", + "largeplate", + "broadaxe", + "scythe", + "excavator", + "largeblade", + "hammerhead", + "fullguard", + "bowstring", + "fletching", + "arrowhead" + }; private static final Map patternCosts = buildPatternCostMap(); @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 1; i < patternName.length; i++) - { + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 1; i < patternName.length; i++) { // if (i != 23) list.add(new ItemStack(b, 1, i)); } } // 2 for full material, 1 for half. - private static Map buildPatternCostMap() - { + private static Map buildPatternCostMap() { Map map = new HashMap(); map.put(0, 2); @@ -89,56 +106,44 @@ private static Map buildPatternCostMap() } @Override - public ItemStack getContainerItem (ItemStack stack) - { - if (stack.stackSize <= 0) - return null; + public ItemStack getContainerItem(ItemStack stack) { + if (stack.stackSize <= 0) return null; return stack; } @Override - public boolean doesContainerItemLeaveCraftingGrid (ItemStack stack) - { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } /* Tags and information about the pattern */ @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { float cost = getPatternCost(stack) / 2f; - if (cost > 0) - { - if (cost - (int) cost < 0.1) - list.add(StatCollector.translateToLocal("pattern1.tooltip") + (int) cost); - else - list.add(StatCollector.translateToLocal("pattern2.tooltip") + cost); + if (cost > 0) { + if (cost - (int) cost < 0.1) list.add(StatCollector.translateToLocal("pattern1.tooltip") + (int) cost); + else list.add(StatCollector.translateToLocal("pattern2.tooltip") + cost); } } - public static Map getPatternCosts() - { + public static Map getPatternCosts() { return patternCosts; } - - public static void setPatternCost (Integer index, Integer newCost) - { - if (patternCosts.containsKey(index)) - { + + public static void setPatternCost(Integer index, Integer newCost) { + if (patternCosts.containsKey(index)) { patternCosts.put(index, newCost); } } @Override - public int getPatternCost (ItemStack pattern) - { + public int getPatternCost(ItemStack pattern) { return patternCosts.containsKey(pattern.getItemDamage()) ? patternCosts.get(pattern.getItemDamage()) : 0; } @Override - public ItemStack getPatternOutput (ItemStack stack, ItemStack input, MaterialSet set) - { + public ItemStack getPatternOutput(ItemStack stack, ItemStack input, MaterialSet set) { return TConstructRegistry.getPartMapping((Item) this, stack.getItemDamage(), set.materialID); } } diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index d1392b9be4e..e00ffb0c5af 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -18,49 +18,43 @@ import tconstruct.world.entity.KingBlueSlime; // spawn egg. -public class TitleIcon extends Item -{ - int[] primaryColor = { 0x66BBE8, 0x66BBE8 }; - int[] secondaryColor = { 0x1567BF, 0xFFEC6E }; - String[] mobNames = { "TConstruct.EdibleSlime", "TConstruct.KingSlime" }; +public class TitleIcon extends Item { + int[] primaryColor = {0x66BBE8, 0x66BBE8}; + int[] secondaryColor = {0x1567BF, 0xFFEC6E}; + String[] mobNames = {"TConstruct.EdibleSlime", "TConstruct.KingSlime"}; - String[] achievementIconNames = new String[] { "tinkerer", "preparedFight", "proTinkerer", "enemySlayer", "dualConvenience" }; + String[] achievementIconNames = + new String[] {"tinkerer", "preparedFight", "proTinkerer", "enemySlayer", "dualConvenience"}; IIcon[] achievementIcons = new IIcon[achievementIconNames.length]; - public TitleIcon() - { + public TitleIcon() { super(); this.setCreativeTab(CreativeTabs.tabMisc); this.setHasSubtypes(true); } @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { ToolCore.blankSprite = iconRegister.registerIcon("tinker:blanksprite"); TProxyClient.metalBall = iconRegister.registerIcon("tinker:metalball"); itemIcon = iconRegister.registerIcon("tinker:tparts"); - for (int i = 0; i < achievementIcons.length; i++) - { - achievementIcons[i] = iconRegister.registerIcon("tinker:achievementIcons/" + (i < achievementIconNames.length ? achievementIconNames[i] : "")); + for (int i = 0; i < achievementIcons.length; i++) { + achievementIcons[i] = iconRegister.registerIcon( + "tinker:achievementIcons/" + (i < achievementIconNames.length ? achievementIconNames[i] : "")); } } @Override @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { + public boolean requiresMultipleRenderPasses() { return true; } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass (int par1, int par2) - { - if (par1 == 255) - return itemIcon; - if (par1 >= 4096) - { + public IIcon getIconFromDamageForRenderPass(int par1, int par2) { + if (par1 == 255) return itemIcon; + if (par1 >= 4096) { return getIconFromDamage(par1); } return new ItemStack(Items.spawn_egg).getItem().getIconFromDamageForRenderPass(par1, par2); @@ -68,13 +62,10 @@ public IIcon getIconFromDamageForRenderPass (int par1, int par2) @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int par1) - { - if (par1 >= 4096) - { + public IIcon getIconFromDamage(int par1) { + if (par1 >= 4096) { int index = par1 - 4096; - if (index < achievementIcons.length) - { + if (index < achievementIcons.length) { return achievementIcons[index]; } } @@ -83,13 +74,11 @@ public IIcon getIconFromDamage (int par1) } @Override - public String getItemStackDisplayName (ItemStack par1ItemStack) - { + public String getItemStackDisplayName(ItemStack par1ItemStack) { String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); String s1 = mobNames[par1ItemStack.getItemDamage()]; - if (s1 != null) - { + if (s1 != null) { s = s + " " + StatCollector.translateToLocal("entity." + s1 + ".name"); } @@ -97,101 +86,95 @@ public String getItemStackDisplayName (ItemStack par1ItemStack) } @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 0; i < mobNames.length; i++) - list.add(new ItemStack(b, 1, i)); + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 0; i < mobNames.length; i++) list.add(new ItemStack(b, 1, i)); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack (ItemStack stack, int pass) - { + public int getColorFromItemStack(ItemStack stack, int pass) { int damage = stack.getItemDamage(); - if (damage == 255) - return 0xffffff; - if (damage >= 4096) - return 0xffffff; + if (damage == 255) return 0xffffff; + if (damage >= 4096) return 0xffffff; return pass == 0 ? primaryColor[damage] : secondaryColor[damage]; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int posX, int posY, int posZ, int par7, float par8, float par9, float par10) - { - if (!world.isRemote) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int posX, + int posY, + int posZ, + int par7, + float par8, + float par9, + float par10) { + if (!world.isRemote) { Block b = world.getBlock(posX, posY, posZ); posX += Facing.offsetsXForSide[par7]; posY += Facing.offsetsYForSide[par7]; posZ += Facing.offsetsZForSide[par7]; double d0 = 0.0D; - if (par7 == 1 && b != null && b.getRenderType() == 11) - { + if (par7 == 1 && b != null && b.getRenderType() == 11) { d0 = 0.5D; } int damage = stack.getItemDamage(); - switch (damage) - { - case 0: - spawnEntity(posX, posY, posZ, new BlueSlime(world), world, player); - break; - case 1: - spawnBossSlime(posX, posY, posZ, new KingBlueSlime(world), world, player); - break; + switch (damage) { + case 0: + spawnEntity(posX, posY, posZ, new BlueSlime(world), world, player); + break; + case 1: + spawnBossSlime(posX, posY, posZ, new KingBlueSlime(world), world, player); + break; } - if (!player.capabilities.isCreativeMode) - { + if (!player.capabilities.isCreativeMode) { --stack.stackSize; } } return true; } - public static EntityLiving activateSpawnEgg (ItemStack stack, World world, double posX, double posY, double posZ, int par7) - { + public static EntityLiving activateSpawnEgg( + ItemStack stack, World world, double posX, double posY, double posZ, int par7) { Block b = world.getBlock((int) posX, (int) posY, (int) posZ); posX += Facing.offsetsXForSide[par7]; posY += Facing.offsetsYForSide[par7]; posZ += Facing.offsetsZForSide[par7]; double d0 = 0.0D; - if (par7 == 1 && b != null && b.getRenderType() == 11) - { + if (par7 == 1 && b != null && b.getRenderType() == 11) { d0 = 0.5D; } int damage = stack.getItemDamage(); EntityLiving entity = null; - switch (damage) - { - case 0: - entity = new BlueSlime(world); - spawnEntity(posX, posY, posZ, entity, world); - break; - case 1: - entity = new KingBlueSlime(world); - spawnBossSlime(posX, posY, posZ, new KingBlueSlime(world), world); - break; + switch (damage) { + case 0: + entity = new BlueSlime(world); + spawnEntity(posX, posY, posZ, entity, world); + break; + case 1: + entity = new KingBlueSlime(world); + spawnBossSlime(posX, posY, posZ, new KingBlueSlime(world), world); + break; } return entity; } - public static void spawnEntity (double x, double y, double z, Entity entity, World world) - { - if (!world.isRemote) - { + public static void spawnEntity(double x, double y, double z, Entity entity, World world) { + if (!world.isRemote) { entity.setPosition(x, y, z); ((EntityLiving) entity).onSpawnWithEgg((IEntityLivingData) null); world.spawnEntityInWorld(entity); } } - public static void spawnEntity (double x, double y, double z, Entity entity, World world, EntityPlayer player) - { - if (!world.isRemote) - { + public static void spawnEntity(double x, double y, double z, Entity entity, World world, EntityPlayer player) { + if (!world.isRemote) { entity.setPosition(x, y, z); if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) entity.setAngles(player.cameraYaw, player.cameraYaw); @@ -200,10 +183,9 @@ public static void spawnEntity (double x, double y, double z, Entity entity, Wor } } - public static void spawnBossSlime (double x, double y, double z, KingBlueSlime entity, World world, EntityPlayer player) - { - if (!world.isRemote) - { + public static void spawnBossSlime( + double x, double y, double z, KingBlueSlime entity, World world, EntityPlayer player) { + if (!world.isRemote) { entity.setPosition(x, y, z); entity.setSlimeSize(8); entity.onSpawnWithEgg((IEntityLivingData) null); @@ -211,10 +193,8 @@ public static void spawnBossSlime (double x, double y, double z, KingBlueSlime e } } - public static void spawnBossSlime (double x, double y, double z, KingBlueSlime entity, World world) - { - if (!world.isRemote) - { + public static void spawnBossSlime(double x, double y, double z, KingBlueSlime entity, World world) { + if (!world.isRemote) { entity.setPosition(x, y, z); entity.setSlimeSize(8); entity.onSpawnWithEgg((IEntityLivingData) null); diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index 2a7b226ccad..35ce6bd8088 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -10,12 +10,10 @@ import tconstruct.tools.TinkerTools; @Deprecated -public class ToolPart extends CraftingItem implements IToolPart -{ +public class ToolPart extends CraftingItem implements IToolPart { public String partName; - public ToolPart(String textureType, String name) - { + public ToolPart(String textureType, String name) { super(toolMaterialNames, buildTextureNames(textureType), "parts/", "tinker", TConstructRegistry.partTab); this.setHasSubtypes(true); this.setMaxDamage(0); @@ -23,19 +21,15 @@ public ToolPart(String textureType, String name) } @Override - public String getItemStackDisplayName (ItemStack par1ItemStack) - { + public String getItemStackDisplayName(ItemStack par1ItemStack) { String material = ""; - if(par1ItemStack.getItemDamage() < toolTextureNames.length) + if (par1ItemStack.getItemDamage() < toolTextureNames.length) material = toolTextureNames[par1ItemStack.getItemDamage()]; String name = ""; - - if (StatCollector.canTranslate("toolpart." + partName + "." + material)) - { + + if (StatCollector.canTranslate("toolpart." + partName + "." + material)) { name = StatCollector.translateToLocal("toolpart." + partName + "." + material); - } - else - { + } else { material = StatCollector.translateToLocal("material." + material); name = StatCollector.translateToLocal("toolpart." + partName); name = name.replaceAll("%%material", material); @@ -44,38 +38,95 @@ public String getItemStackDisplayName (ItemStack par1ItemStack) return name; } - private static String[] buildTextureNames (String textureType) - { + private static String[] buildTextureNames(String textureType) { String[] names = new String[toolMaterialNames.length]; - for (int i = 0; i < toolMaterialNames.length; i++) - { - if (toolTextureNames[i].equals("")) - names[i] = ""; - else - names[i] = toolTextureNames[i] + textureType; + for (int i = 0; i < toolMaterialNames.length; i++) { + if (toolTextureNames[i].equals("")) names[i] = ""; + else names[i] = toolTextureNames[i] + textureType; } return names; } - public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "Pig Iron", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; + public static final String[] toolMaterialNames = new String[] { + "Wood", + "Stone", + "Iron", + "Flint", + "Cactus", + "Bone", + "Obsidian", + "Netherrack", + "Slime", + "Paper", + "Cobalt", + "Ardite", + "Manyullyn", + "Copper", + "Bronze", + "Alumite", + "Steel", + "Blue Slime", + "Pig Iron", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "Thaumium" + }; - public static final String[] toolTextureNames = new String[] { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", "pigiron", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; + public static final String[] toolTextureNames = new String[] { + "wood", + "stone", + "iron", + "flint", + "cactus", + "bone", + "obsidian", + "netherrack", + "slime", + "paper", + "cobalt", + "ardite", + "manyullyn", + "copper", + "bronze", + "alumite", + "steel", + "blueslime", + "pigiron", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "thaumium" + }; @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 0; i < 19; i++) - list.add(new ItemStack(b, 1, i)); + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 0; i < 19; i++) list.add(new ItemStack(b, 1, i)); - if (TinkerTools.thaumcraftAvailable) - list.add(new ItemStack(b, 1, 31)); + if (TinkerTools.thaumcraftAvailable) list.add(new ItemStack(b, 1, 31)); } @Override - public int getMaterialID (ItemStack stack) - { - if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) - return stack.getItemDamage(); + public int getMaterialID(ItemStack stack) { + if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) return stack.getItemDamage(); return -1; } diff --git a/src/main/java/tconstruct/tools/items/ToolPartHidden.java b/src/main/java/tconstruct/tools/items/ToolPartHidden.java index 61a98f05ea1..d2dd86840e7 100644 --- a/src/main/java/tconstruct/tools/items/ToolPartHidden.java +++ b/src/main/java/tconstruct/tools/items/ToolPartHidden.java @@ -5,17 +5,12 @@ import net.minecraft.item.Item; @Deprecated -public class ToolPartHidden extends ToolPart -{ +public class ToolPartHidden extends ToolPart { - public ToolPartHidden(String textureType, String name) - { + public ToolPartHidden(String textureType, String name) { super(textureType, name); } @Override - public void getSubItems (Item id, CreativeTabs tab, List list) - { - - } + public void getSubItems(Item id, CreativeTabs tab, List list) {} } diff --git a/src/main/java/tconstruct/tools/items/ToolShard.java b/src/main/java/tconstruct/tools/items/ToolShard.java index e8265af613b..e02fe83f84a 100644 --- a/src/main/java/tconstruct/tools/items/ToolShard.java +++ b/src/main/java/tconstruct/tools/items/ToolShard.java @@ -1,29 +1,24 @@ package tconstruct.tools.items; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.DynamicToolPart; -import java.util.List; - -public class ToolShard extends DynamicToolPart -{ +public class ToolShard extends DynamicToolPart { - public ToolShard(String tex, String name) - { + public ToolShard(String tex, String name) { super(tex, name); } @Override - public void getSubItems (Item item, CreativeTabs tab, List list) - { + public void getSubItems(Item item, CreativeTabs tab, List list) { // material id == metadata - for(Integer matID : TConstructRegistry.defaultShardMaterials) { + for (Integer matID : TConstructRegistry.defaultShardMaterials) { ItemStack stack = new ItemStack(item, 1, matID); - if (this.getMaterialID(stack) != -1) - list.add(stack); + if (this.getMaterialID(stack) != -1) list.add(stack); } } } diff --git a/src/main/java/tconstruct/tools/logic/BattlesignLogic.java b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java index 41fea5da39c..93b30bc81ed 100644 --- a/src/main/java/tconstruct/tools/logic/BattlesignLogic.java +++ b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java @@ -11,86 +11,69 @@ * 0: Battlesign item */ -public class BattlesignLogic extends EquipLogic -{ +public class BattlesignLogic extends EquipLogic { protected String[] text; - public BattlesignLogic() - { + public BattlesignLogic() { super(1); } @Override - public String getDefaultName () - { + public String getDefaultName() { return "decoration.battlesign"; } @Override /* NBT */ - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); text = new String[tags.getInteger("lineCount")]; - for (int i = 0; i < text.length; i++) - { + for (int i = 0; i < text.length; i++) { text[i] = tags.getString("line" + i); } } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); - if (text == null) - { + if (text == null) { text = new String[0]; } tags.setInteger("lineCount", text.length); - for (int i = 0; i < text.length; i++) - { + for (int i = 0; i < text.length; i++) { tags.setString("line" + i, text[i]); } } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { - return null; //Not a normal gui block + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { + return null; // Not a normal gui block } @Override - public String getInventoryName () - { + public String getInventoryName() { return null; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} - public void setText (String[] text) - { + public void setText(String[] text) { this.text = text; } - public String[] getText () - { + public String[] getText() { return text; } @Override - public S35PacketUpdateTileEntity getDescriptionPacket () - { + public S35PacketUpdateTileEntity getDescriptionPacket() { NBTTagCompound compound = new NBTTagCompound(); this.writeToNBT(compound); @@ -99,8 +82,7 @@ public S35PacketUpdateTileEntity getDescriptionPacket () } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { this.readFromNBT(pkt.func_148857_g()); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index 6d8a0d566c0..f422f7e38d7 100644 --- a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -1,5 +1,6 @@ package tconstruct.tools.logic; +import java.lang.ref.WeakReference; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -15,8 +16,6 @@ import tconstruct.tools.inventory.CraftingStationContainer; import tconstruct.util.config.PHConstruct; -import java.lang.ref.WeakReference; - public class CraftingStationLogic extends InventoryLogic implements ISidedInventory { public ForgeDirection chestDirection = ForgeDirection.UNKNOWN; public int chestSize; @@ -42,8 +41,7 @@ public boolean canDropInventorySlot(int slot) { @Override public ItemStack decrStackSize(int slot, int quantity) { if (slot == 0) { - for (int i = 1; i < getSizeInventory(); i++) - decrStackSize(i, 1); + for (int i = 1; i < getSizeInventory(); i++) decrStackSize(i, 1); } return super.decrStackSize(slot, quantity); } @@ -67,7 +65,9 @@ public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, i for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { final int xPos = x + dir.offsetX, yPos = y + dir.offsetY, zPos = z + dir.offsetZ; final TileEntity tile = world.getTileEntity(xPos, yPos, zPos); - if (!(tile instanceof IInventory) || (tile instanceof CraftingStationLogic) || isBlacklisted(tile.getClass())) continue; + if (!(tile instanceof IInventory) + || (tile instanceof CraftingStationLogic) + || isBlacklisted(tile.getClass())) continue; final IInventory inv = (IInventory) tile; @@ -82,13 +82,22 @@ public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, i continue; } - if(tile instanceof ISidedInventory && ((ISidedInventory)tile).getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length == 0) continue; - + if (tile instanceof ISidedInventory + && ((ISidedInventory) tile) + .getAccessibleSlotsFromSide( + dir.getOpposite().ordinal()) + .length + == 0) continue; + if (chest == null && inv.isUseableByPlayer(inventoryplayer.player)) { chest = new WeakReference<>(inv); chestDirection = dir; invColumns = 6; - chestSize = tile instanceof ISidedInventory ? ((ISidedInventory)tile).getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length : inv.getSizeInventory(); + chestSize = tile instanceof ISidedInventory + ? ((ISidedInventory) tile) + .getAccessibleSlotsFromSide(dir.getOpposite().ordinal()) + .length + : inv.getSizeInventory(); if (tile instanceof TileEntityChest) { checkForChest(world, xPos, yPos, zPos, 1, 0); @@ -98,8 +107,7 @@ public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, i } slotCount = chestSize * (doubleChest != null ? 2 : 1); invRows = (int) Math.ceil((double) slotCount / invColumns); - } - + } } return new CraftingStationContainer(inventoryplayer, this, x, y, z); @@ -108,7 +116,7 @@ public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, i private boolean isBlacklisted(Class clazz) { return PHConstruct.craftingStationBlacklist.contains(clazz.getName()); } - + void checkForChest(World world, int x, int y, int z, int dx, int dz) { TileEntity tile = world.getTileEntity(x + dx, y, z + dz); if (tile instanceof TileEntityChest) { @@ -116,11 +124,11 @@ void checkForChest(World world, int x, int y, int z, int dx, int dz) { doubleFirst = dx + dz < 0; } } - + public boolean isDoubleChest() { return this.doubleChest != null; } - + public IInventory getFirstInventory() { if (doubleFirst && doubleChest != null) { return doubleChest.get(); @@ -130,7 +138,7 @@ public IInventory getFirstInventory() { } public IInventory getSecondInventory() { - if(!isDoubleChest()) return null; + if (!isDoubleChest()) return null; if (doubleFirst) { return chest.get(); @@ -154,8 +162,7 @@ public static boolean isUseableByPlayer(EntityPlayer player, WeakReference[] inv for (WeakReference ref : inventories) { if (ref != null) { IInventory inv = ref.get(); - if (inv != null && !inv.isUseableByPlayer(player)) - return false; + if (inv != null && !inv.isUseableByPlayer(player)) return false; } } @@ -164,12 +171,12 @@ public static boolean isUseableByPlayer(EntityPlayer player, WeakReference[] inv @SuppressWarnings("rawtypes") public WeakReference[] getInventories() { - return new WeakReference[]{this.chest, this.doubleChest, this.patternChest, this.furnace}; + return new WeakReference[] {this.chest, this.doubleChest, this.patternChest, this.furnace}; } @Override public int[] getAccessibleSlotsFromSide(int var1) { - return new int[]{}; + return new int[] {}; } @Override diff --git a/src/main/java/tconstruct/tools/logic/EquipLogic.java b/src/main/java/tconstruct/tools/logic/EquipLogic.java index 418d728be83..cd5255b9f8b 100644 --- a/src/main/java/tconstruct/tools/logic/EquipLogic.java +++ b/src/main/java/tconstruct/tools/logic/EquipLogic.java @@ -12,57 +12,45 @@ * 2-9: Food */ -public abstract class EquipLogic extends InventoryLogic -{ +public abstract class EquipLogic extends InventoryLogic { - public EquipLogic(int invSize) - { + public EquipLogic(int invSize) { super(invSize); } - public void setEquipmentItem (ItemStack stack) - { + public void setEquipmentItem(ItemStack stack) { inventory[0] = stack.copy(); } - public boolean hasEquipmentItem () - { + public boolean hasEquipmentItem() { return inventory[0] != null; } - public ItemStack getEquipmentItem () - { + public ItemStack getEquipmentItem() { return inventory[0]; } @Override - public void setInventorySlotContents (int slot, ItemStack stack) - { - if (slot == 0) - { + public void setInventorySlotContents(int slot, ItemStack stack) { + if (slot == 0) { return; - } - else - { + } else { super.setInventorySlotContents(slot, stack); } } @Override - public ItemStack getStackInSlot (int slot) - { + public ItemStack getStackInSlot(int slot) { return slot != 0 ? inventory[slot] : null; } @Override - public boolean isStackInSlot (int slot) - { + public boolean isStackInSlot(int slot) { return slot != 0 ? inventory[slot] != null : false; } @Override - public S35PacketUpdateTileEntity getDescriptionPacket () - { + public S35PacketUpdateTileEntity getDescriptionPacket() { NBTTagCompound compound = new NBTTagCompound(); this.writeToNBT(compound); @@ -71,8 +59,7 @@ public S35PacketUpdateTileEntity getDescriptionPacket () } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity pkt) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { this.readFromNBT(pkt.func_148857_g()); } } diff --git a/src/main/java/tconstruct/tools/logic/FrypanLogic.java b/src/main/java/tconstruct/tools/logic/FrypanLogic.java index 467f1fd9db3..9d8322072be 100644 --- a/src/main/java/tconstruct/tools/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/tools/logic/FrypanLogic.java @@ -20,51 +20,42 @@ * 2-9: Food */ -public class FrypanLogic extends EquipLogic implements IActiveLogic -{ +public class FrypanLogic extends EquipLogic implements IActiveLogic { boolean active; public int fuel; public int fuelGague; public int progress; - public FrypanLogic() - { + public FrypanLogic() { super(10); active = false; } @Override - public String getDefaultName () - { + public String getDefaultName() { return "crafters.frypan"; } @Override - public boolean getActive () - { + public boolean getActive() { return active; } @Override - public void setActive (boolean flag) - { + public void setActive(boolean flag) { active = flag; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } /* Fuel gauge */ - public int gaugeProgressScaled (int scale) - { + public int gaugeProgressScaled(int scale) { return (progress * scale) / 1000; } - public int gaugeFuelScaled (int scale) - { - if (fuelGague == 0) - { + public int gaugeFuelScaled(int scale) { + if (fuelGague == 0) { fuelGague = fuel; - if (fuelGague == 0) - { + if (fuelGague == 0) { fuelGague = 1000; } } @@ -73,84 +64,65 @@ public int gaugeFuelScaled (int scale) /* Item cooking */ @Override - public void updateEntity () - { + public void updateEntity() { boolean burning = isBurning(); boolean updateInventory = false; - if (fuel <= 0 && canCook()) - { + if (fuel <= 0 && canCook()) { fuel = fuelGague = (int) (getItemBurnTime(inventory[1]) * 2.5); - if (fuel > 0) - { - if (inventory[1].getItem().hasContainerItem(inventory[1])) //Fuel slot + if (fuel > 0) { + if (inventory[1].getItem().hasContainerItem(inventory[1])) // Fuel slot { inventory[1] = inventory[1].getItem().getContainerItem(inventory[1]); - } - else - { + } else { inventory[1].stackSize--; } - if (inventory[1].stackSize <= 0) - { + if (inventory[1].stackSize <= 0) { inventory[1] = null; } updateInventory = true; } } - if (isBurning() && canCook()) - { + if (isBurning() && canCook()) { progress++; - if (progress >= 1000) - { + if (progress >= 1000) { progress = 0; cookItems(); updateInventory = true; } - } - else - { + } else { progress = 0; } - if (fuel > 0) - { + if (fuel > 0) { fuel--; } - if (burning != isBurning()) - { + if (burning != isBurning()) { setActive(isBurning()); updateInventory = true; } - if (updateInventory) - { + if (updateInventory) { markDirty(); } } - public void cookItems () - { - if (!canCook()) - return; + public void cookItems() { + if (!canCook()) return; - for (int id = 2; id < 10; id++) //Check every slot + for (int id = 2; id < 10; id++) // Check every slot { - if (canCook()) - { + if (canCook()) { ItemStack result = getResultFor(inventory[id]); - if (result != null) - { + if (result != null) { int ids = 2; boolean placed = false; - while (ids < 10 && !placed) //Try to merge stacks first + while (ids < 10 && !placed) // Try to merge stacks first { - if (inventory[ids] != null && inventory[ids].isItemEqual(result) && inventory[ids].stackSize < inventory[ids].getMaxStackSize()) - { - if (inventory[ids].stackSize + result.stackSize <= inventory[ids].getMaxStackSize()) - { + if (inventory[ids] != null + && inventory[ids].isItemEqual(result) + && inventory[ids].stackSize < inventory[ids].getMaxStackSize()) { + if (inventory[ids].stackSize + result.stackSize <= inventory[ids].getMaxStackSize()) { inventory[ids].stackSize += result.stackSize; placed = true; - } - else - { + } else { int decrement = inventory[ids].getMaxStackSize() - inventory[ids].stackSize; inventory[ids].stackSize = inventory[ids].getMaxStackSize(); result.stackSize -= decrement; @@ -160,127 +132,101 @@ public void cookItems () } ids = 2; - while (!placed && ids < 10) //Place remaining in slot + while (!placed && ids < 10) // Place remaining in slot { - if (inventory[ids] == null) - { + if (inventory[ids] == null) { inventory[ids] = result; placed = true; } ids++; } - if (placed) - decrStackSize(id, 1); + if (placed) decrStackSize(id, 1); } } } } - public boolean canCook () - { - for (int id = 2; id < 10; id++) - { - if (inventory[id] == null) //Nothing here! - continue; + public boolean canCook() { + for (int id = 2; id < 10; id++) { + if (inventory[id] == null) // Nothing here! + continue; ItemStack result = getResultFor(inventory[id]); - if (result == null) //Doesn't cook into anything - continue; + if (result == null) // Doesn't cook into anything + continue; - for (int slotid = 2; slotid < 10; slotid++) - { - if (inventory[slotid] == null) - return true; - - else if (inventory[slotid].isItemEqual(result) && inventory[slotid].stackSize + result.stackSize <= inventory[slotid].getMaxStackSize()) + for (int slotid = 2; slotid < 10; slotid++) { + if (inventory[slotid] == null) return true; + else if (inventory[slotid].isItemEqual(result) + && inventory[slotid].stackSize + result.stackSize <= inventory[slotid].getMaxStackSize()) return true; } } return false; } - public boolean isBurning () - { + public boolean isBurning() { return fuel > 0; } - public ItemStack getResultFor (ItemStack stack) - { - if (stack == null) - { + public ItemStack getResultFor(ItemStack stack) { + if (stack == null) { return null; - } - else - { + } else { ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); - if (result != null && result.getItem() instanceof ItemFood) //Only valid for food - return result.copy(); + if (result != null && result.getItem() instanceof ItemFood) // Only valid for food + return result.copy(); return null; } } - public static int getItemBurnTime (ItemStack stack) - { - if (stack == null) - { + public static int getItemBurnTime(ItemStack stack) { + if (stack == null) { return 0; - } - else - { + } else { Item item = stack.getItem(); - if (stack.getItem() instanceof ItemBlock && BlockUtils.getBlockFromItem(item) != null) - { + if (stack.getItem() instanceof ItemBlock && BlockUtils.getBlockFromItem(item) != null) { Block block = BlockUtils.getBlockFromItem(item); - if (block == Blocks.wooden_slab) - { + if (block == Blocks.wooden_slab) { return 150; } - if (block == Blocks.log) - { + if (block == Blocks.log) { return 2400; } - if (block.getMaterial() == Material.wood) - { + if (block.getMaterial() == Material.wood) { return 300; } } - if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) - return 200; - if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) - return 200; - if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) - return 200; - if (item == Items.stick) - return 100; - if (item == Items.coal) - return 800; - if (item == Items.lava_bucket) - return 20000; - if (new ItemStack(item).equals(new ItemStack(Blocks.sapling))) - return 100; - if (item == Items.blaze_rod) - return 2400; + if (item instanceof ItemTool + && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemSword + && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemHoe + && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; + if (item == Items.stick) return 100; + if (item == Items.coal) return 800; + if (item == Items.lava_bucket) return 20000; + if (new ItemStack(item).equals(new ItemStack(Blocks.sapling))) return 100; + if (item == Items.blaze_rod) return 2400; return GameRegistry.getFuelValue(stack); } } /* NBT */ - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); active = tags.getBoolean("Active"); fuel = tags.getInteger("Fuel"); fuelGague = tags.getInteger("FuelGague"); } - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); @@ -288,30 +234,23 @@ public void writeToNBT (NBTTagCompound tags) } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new FrypanContainer(inventoryplayer.player, this); } @Override - public String getInventoryName () - { + public String getInventoryName() { return getDefaultName(); } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return true; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } -} \ No newline at end of file + public void closeInventory() {} +} diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index cc48e4d0616..47073b15d42 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -27,55 +27,46 @@ * 3-16: Chest */ -public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacingLogic, ISidedInventory -{ +public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacingLogic, ISidedInventory { boolean active = false; public int fuel; public int fuelGague; public int progress; public int fuelScale = 200; byte direction; - private static final int[] slots_top = new int[] { 0 }; - private static final int[] slots_bottom = new int[] { 2, 1 }; - private static final int[] slots_sides = new int[] { 1 }; + private static final int[] slots_top = new int[] {0}; + private static final int[] slots_bottom = new int[] {2, 1}; + private static final int[] slots_sides = new int[] {1}; - public FurnaceLogic() - { + public FurnaceLogic() { super(3); } @Override - public String getDefaultName () - { + public String getDefaultName() { return "container.furnace"; } @Override - public boolean getActive () - { + public boolean getActive() { return active; } @Override - public void setActive (boolean flag) - { + public void setActive(boolean flag) { active = flag; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } /* Fuel gauge */ - public int gaugeProgressScaled (int scale) - { + public int gaugeProgressScaled(int scale) { return (progress * scale) / fuelScale; } - public int gaugeFuelScaled (int scale) - { - if (fuelGague == 0) - { + public int gaugeFuelScaled(int scale) { + if (fuelGague == 0) { fuelGague = fuel; - if (fuelGague == 0) - { + if (fuelGague == 0) { fuelGague = fuelScale; } } @@ -84,175 +75,133 @@ public int gaugeFuelScaled (int scale) /* Item cooking */ @Override - public void updateEntity () - { + public void updateEntity() { boolean burning = isBurning(); boolean updateInventory = false; - if (fuel <= 0 && canSmelt()) - { + if (fuel <= 0 && canSmelt()) { fuel = fuelGague = (int) (getItemBurnTime(inventory[1])); - if (fuel > 0) - { + if (fuel > 0) { if (inventory[1].getItem().hasContainerItem()) // Fuel slot { inventory[1] = new ItemStack(inventory[1].getItem().getContainerItem()); - } - else - { + } else { inventory[1].stackSize--; } - if (inventory[1].stackSize <= 0) - { + if (inventory[1].stackSize <= 0) { inventory[1] = null; } updateInventory = true; } } - if (isBurning() && canSmelt()) - { + if (isBurning() && canSmelt()) { progress++; - if (progress >= fuelScale) - { + if (progress >= fuelScale) { progress = 0; cookItems(); updateInventory = true; } - } - else - { + } else { progress = 0; } - if (fuel > 0) - { + if (fuel > 0) { fuel--; } - if (burning != isBurning()) - { + if (burning != isBurning()) { setActive(isBurning()); updateInventory = true; } - if (updateInventory) - { + if (updateInventory) { markDirty(); } } - public void cookItems () - { - if (this.canSmelt()) - { + public void cookItems() { + if (this.canSmelt()) { ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); - if (this.inventory[2] == null) - { + if (this.inventory[2] == null) { this.inventory[2] = itemstack.copy(); - } - else if (this.inventory[2].isItemEqual(itemstack)) - { + } else if (this.inventory[2].isItemEqual(itemstack)) { inventory[2].stackSize += itemstack.stackSize; } --this.inventory[0].stackSize; - if (this.inventory[0].stackSize <= 0) - { + if (this.inventory[0].stackSize <= 0) { this.inventory[0] = null; } } - } - public boolean canSmelt () - { + public boolean canSmelt() { if (inventory[0] == null) // Nothing here! - return false; - else - { + return false; + else { ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); - if (itemstack == null) - return false; - if (this.inventory[2] == null) - return true; - if (!this.inventory[2].isItemEqual(itemstack)) - return false; + if (itemstack == null) return false; + if (this.inventory[2] == null) return true; + if (!this.inventory[2].isItemEqual(itemstack)) return false; int result = inventory[2].stackSize + itemstack.stackSize; return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); } } - public boolean isBurning () - { + public boolean isBurning() { return fuel > 0; } - public ItemStack getResultFor (ItemStack stack) - { + public ItemStack getResultFor(ItemStack stack) { ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); if (result != null) // Only valid for food - return result.copy(); + return result.copy(); return null; } - public static int getItemBurnTime (ItemStack stack) - { - if (stack == null) - { + public static int getItemBurnTime(ItemStack stack) { + if (stack == null) { return 0; - } - else - { + } else { Item item = stack.getItem(); - if (stack.getItem() instanceof ItemBlock && BlockUtils.getBlockFromItem(item) != null) - { + if (stack.getItem() instanceof ItemBlock && BlockUtils.getBlockFromItem(item) != null) { Block block = BlockUtils.getBlockFromItem(item); - if (block == Blocks.wooden_slab) - { + if (block == Blocks.wooden_slab) { return 150; } - if (block == Blocks.log) - { + if (block == Blocks.log) { return 1200; } - if (block.getMaterial() == Material.wood) - { + if (block.getMaterial() == Material.wood) { return 300; } - if (block == Blocks.coal_block) - { + if (block == Blocks.coal_block) { return 16000; } } - if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) - return 200; - if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) - return 200; - if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) - return 200; - if (item == Items.stick) - return 100; - if (item == Items.coal) - return 1600; - if (item == Items.lava_bucket) - return 20000; - if (item == new ItemStack(Blocks.sapling).getItem()) - return 100; - if (item == Items.blaze_rod) - return 2400; + if (item instanceof ItemTool + && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemSword + && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemHoe + && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; + if (item == Items.stick) return 100; + if (item == Items.coal) return 1600; + if (item == Items.lava_bucket) return 20000; + if (item == new ItemStack(Blocks.sapling).getItem()) return 100; + if (item == Items.blaze_rod) return 2400; return GameRegistry.getFuelValue(stack); } } /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); active = tags.getBoolean("Active"); fuel = tags.getInteger("Fuel"); @@ -261,140 +210,118 @@ public void readFromNBT (NBTTagCompound tags) } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); writeNetworkNBT(tags); } - public void readNetworkNBT (NBTTagCompound tags) - { + public void readNetworkNBT(NBTTagCompound tags) { active = tags.getBoolean("Active"); direction = tags.getByte("Direction"); } - public void writeNetworkNBT (NBTTagCompound tags) - { + public void writeNetworkNBT(NBTTagCompound tags) { tags.setBoolean("Active", active); tags.setByte("Direction", direction); } /* Packets */ @Override - public Packet getDescriptionPacket () - { + public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); writeNetworkNBT(tag); return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) - { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readNetworkNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new FurnaceContainer(inventoryplayer, this); } @Override - public byte getRenderDirection () - { + public byte getRenderDirection() { return direction; } @Override - public ForgeDirection getForgeDirection () - { + public ForgeDirection getForgeDirection() { return ForgeDirection.VALID_DIRECTIONS[direction]; } @Override @Deprecated - public void setDirection (int side) - { + public void setDirection(int side) { // Nope! } @Override @Deprecated - public void setDirection (float yaw, float pitch, EntityLivingBase player) - { + public void setDirection(float yaw, float pitch, EntityLivingBase player) { int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; - switch (facing) - { - case 0: - direction = 2; - break; - - case 1: - direction = 5; - break; - - case 2: - direction = 3; - break; - - case 3: - direction = 4; - break; + switch (facing) { + case 0: + direction = 2; + break; + + case 1: + direction = 5; + break; + + case 2: + direction = 3; + break; + + case 3: + direction = 4; + break; } } @Override - public String getInventoryName () - { + public String getInventoryName() { return getDefaultName(); } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} - public static boolean isItemFuel (ItemStack par0ItemStack) - { + public static boolean isItemFuel(ItemStack par0ItemStack) { return getItemBurnTime(par0ItemStack) > 0; } @Override - public boolean isItemValidForSlot (int par1, ItemStack par2ItemStack) - { + public boolean isItemValidForSlot(int par1, ItemStack par2ItemStack) { return par1 == 2 ? false : (par1 == 1 ? isItemFuel(par2ItemStack) : true); } @Override - public int[] getAccessibleSlotsFromSide (int par1) - { + public int[] getAccessibleSlotsFromSide(int par1) { return par1 == 0 ? slots_bottom : (par1 == 1 ? slots_top : slots_sides); } @Override - public boolean canInsertItem (int par1, ItemStack par2ItemStack, int par3) - { + public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) { return this.isItemValidForSlot(par1, par2ItemStack); } @Override - public boolean canExtractItem (int par1, ItemStack par2ItemStack, int par3) - { + public boolean canExtractItem(int par1, ItemStack par2ItemStack, int par3) { return par3 != 0 || par1 != 1 || par2ItemStack.getItem() == Items.bucket; } } diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index 70d1fe94d51..1fe1c1086b3 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -11,33 +11,26 @@ import tconstruct.library.util.IPattern; import tconstruct.tools.inventory.*; -public class PartBuilderLogic extends InventoryLogic implements ISidedInventory -{ +public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { boolean craftedTop; boolean craftedBottom; - public PartBuilderLogic() - { + public PartBuilderLogic() { super(10); craftedTop = false; craftedBottom = false; } @Override - public String getDefaultName () - { + public String getDefaultName() { return "toolstation.parts"; } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { - for (int xPos = x - 1; xPos <= x + 1; xPos++) - { - for (int zPos = z - 1; zPos <= z + 1; zPos++) - { - for (int yPos = y - 1; yPos <= y + 1; yPos++) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { + for (int xPos = x - 1; xPos <= x + 1; xPos++) { + for (int zPos = z - 1; zPos <= z + 1; zPos++) { + for (int yPos = y - 1; yPos <= y + 1; yPos++) { TileEntity tile = world.getTileEntity(xPos, yPos, zPos); if (tile != null && tile instanceof PatternChestLogic && (x == xPos || z == zPos)) return new PartCrafterChestContainer(inventoryplayer, this, (PatternChestLogic) tile); @@ -48,172 +41,132 @@ public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, } @Override - public boolean canDropInventorySlot (int slot) - { + public boolean canDropInventorySlot(int slot) { return slot <= 3; // 0-3 = only drop input slots } - //Called when emptying a slot, not when another item is placed in it + // Called when emptying a slot, not when another item is placed in it @Override - public ItemStack decrStackSize (int slotID, int quantity) - { + public ItemStack decrStackSize(int slotID, int quantity) { ItemStack returnStack = super.decrStackSize(slotID, quantity); tryBuildPart(slotID); return returnStack; } - public void tryBuildPart (int slotID) - { - if (slotID == 4 || slotID == 5) - { - if (!craftedTop && inventory[0] != null) - { + public void tryBuildPart(int slotID) { + if (slotID == 4 || slotID == 5) { + if (!craftedTop && inventory[0] != null) { int value = PatternBuilder.instance.getPartValue(inventory[2]); IPattern item = (IPattern) inventory[0].getItem(); int cost = item != null ? item.getPatternCost(inventory[0]) : 0; - if (value > 0 && cost > 0) - { + if (value > 0 && cost > 0) { int decrease = cost / value; - if (cost % value != 0) - decrease++; - super.decrStackSize(2, decrease); //Call super to avoid crafting again + if (cost % value != 0) decrease++; + super.decrStackSize(2, decrease); // Call super to avoid crafting again } } - if (inventory[4] != null || inventory[5] != null) - craftedTop = true; - else - craftedTop = false; + if (inventory[4] != null || inventory[5] != null) craftedTop = true; + else craftedTop = false; } - if (!craftedTop) - buildTopPart(); + if (!craftedTop) buildTopPart(); - if (slotID == 6 || slotID == 7) - { - if (!craftedBottom && inventory[1] != null) - { + if (slotID == 6 || slotID == 7) { + if (!craftedBottom && inventory[1] != null) { int value = PatternBuilder.instance.getPartValue(inventory[3]); IPattern item = (IPattern) inventory[1].getItem(); int cost = item != null ? item.getPatternCost(inventory[1]) : 0; - if (value > 0 && cost > 0) - { + if (value > 0 && cost > 0) { int decrease = cost / value; - if (cost % value != 0) - decrease++; - super.decrStackSize(3, decrease); //Call super to avoid crafting again + if (cost % value != 0) decrease++; + super.decrStackSize(3, decrease); // Call super to avoid crafting again } } - if (inventory[6] != null || inventory[7] != null) - craftedBottom = true; - else - craftedBottom = false; + if (inventory[6] != null || inventory[7] != null) craftedBottom = true; + else craftedBottom = false; } - if (!craftedBottom) - buildBottomPart(); + if (!craftedBottom) buildBottomPart(); } - //Called when a slot has something placed into it. + // Called when a slot has something placed into it. @Override - public void setInventorySlotContents (int slot, ItemStack itemstack) - { + public void setInventorySlotContents(int slot, ItemStack itemstack) { super.setInventorySlotContents(slot, itemstack); - if ((slot == 0 || slot == 2) && !craftedTop) - buildTopPart(); - if ((slot == 1 || slot == 3) && !craftedBottom) - buildBottomPart(); + if ((slot == 0 || slot == 2) && !craftedTop) buildTopPart(); + if ((slot == 1 || slot == 3) && !craftedBottom) buildBottomPart(); } - void buildTopPart () - { + void buildTopPart() { ItemStack[] parts = PatternBuilder.instance.getToolPart(inventory[2], inventory[0], inventory[1]); - if (parts != null) - { + if (parts != null) { inventory[4] = parts[0]; inventory[5] = parts[1]; - } - else - { + } else { inventory[4] = inventory[5] = null; } } - void buildBottomPart () - { + void buildBottomPart() { ItemStack[] parts = PatternBuilder.instance.getToolPart(inventory[3], inventory[1], inventory[0]); - if (parts != null) - { + if (parts != null) { inventory[6] = parts[0]; inventory[7] = parts[1]; - } - else - { + } else { inventory[6] = inventory[7] = null; } } /* NBT */ @Override - public void readFromNBT (NBTTagCompound tags) - { + public void readFromNBT(NBTTagCompound tags) { super.readFromNBT(tags); craftedTop = tags.getBoolean("CraftedTop"); craftedBottom = tags.getBoolean("CraftedBottom"); } @Override - public void writeToNBT (NBTTagCompound tags) - { + public void writeToNBT(NBTTagCompound tags) { super.writeToNBT(tags); tags.setBoolean("CraftedTop", craftedTop); tags.setBoolean("CraftedBottom", craftedBottom); } @Override - public int[] getAccessibleSlotsFromSide (int side) - { + public int[] getAccessibleSlotsFromSide(int side) { return new int[0]; } @Override - public boolean canInsertItem (int i, ItemStack itemstack, int j) - { + public boolean canInsertItem(int i, ItemStack itemstack, int j) { return false; } @Override - public boolean canExtractItem (int i, ItemStack itemstack, int j) - { + public boolean canExtractItem(int i, ItemStack itemstack, int j) { return false; } @Override - public String getInventoryName () - { + public String getInventoryName() { return getDefaultName(); } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} @Override - public boolean canUpdate () - { + public boolean canUpdate() { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/logic/PatternChestLogic.java b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java index 4cce9044b55..903b9a0f16f 100644 --- a/src/main/java/tconstruct/tools/logic/PatternChestLogic.java +++ b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java @@ -8,40 +8,33 @@ import tconstruct.library.util.IPattern; import tconstruct.tools.inventory.PatternChestContainer; -public class PatternChestLogic extends InventoryLogic -{ - public PatternChestLogic() - { +public class PatternChestLogic extends InventoryLogic { + public PatternChestLogic() { super(30); } @Override - public boolean canUpdate () - { + public boolean canUpdate() { return false; } @Override - public String getDefaultName () - { + public String getDefaultName() { return "toolstation.patternholder"; } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new PatternChestContainer(inventoryplayer, this); } @Override - public String getInventoryName () - { + public String getInventoryName() { return getDefaultName(); } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return true; } @@ -51,12 +44,8 @@ public boolean isItemValidForSlot(int slot, ItemStack itemstack) { } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } -} \ No newline at end of file + public void closeInventory() {} +} diff --git a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java index 4530d7f005f..66da28d8056 100644 --- a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java @@ -10,30 +10,25 @@ import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; -public class StencilTableLogic extends InventoryLogic implements ISidedInventory -{ +public class StencilTableLogic extends InventoryLogic implements ISidedInventory { private ItemStack selectedStack; - public StencilTableLogic() - { + public StencilTableLogic() { super(2); } @Override - public boolean canUpdate () - { + public boolean canUpdate() { return false; } @Override - public String getDefaultName () - { + public String getDefaultName() { return "toolstation.PatternShaper"; } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new PatternShaperContainer(inventoryplayer, this); } @@ -45,67 +40,49 @@ public void onInventoryChanged() super.onInventoryChanged(); }*/ - public void setSelectedPattern (ItemStack stack) - { + public void setSelectedPattern(ItemStack stack) { selectedStack = stack; this.setInventorySlotContents(1, stack); } @Override - public void setInventorySlotContents (int slot, ItemStack itemstack) - { + public void setInventorySlotContents(int slot, ItemStack itemstack) { super.setInventorySlotContents(slot, itemstack); if (slot == 0) { - if (itemstack != null && StencilBuilder.isBlank(itemstack)) - { + if (itemstack != null && StencilBuilder.isBlank(itemstack)) { super.setInventorySlotContents(1, selectedStack); - } - else if (itemstack!=null) - { - ItemStack cpy=itemstack.copy(); - cpy.stackSize=1; + } else if (itemstack != null) { + ItemStack cpy = itemstack.copy(); + cpy.stackSize = 1; super.setInventorySlotContents(1, cpy); - } - else - { - super.setInventorySlotContents(1,null); + } else { + super.setInventorySlotContents(1, null); } } } @Override - public ItemStack decrStackSize (int slot, int quantity) - { - if (slot == 1) - { + public ItemStack decrStackSize(int slot, int quantity) { + if (slot == 1) { super.decrStackSize(0, 1); - if (inventory[0] == null) - return super.decrStackSize(slot, quantity); - else - return inventory[1].copy(); - } - else - { + if (inventory[0] == null) return super.decrStackSize(slot, quantity); + else return inventory[1].copy(); + } else { ItemStack ret = super.decrStackSize(slot, quantity); - if (inventory[0] == null) - super.decrStackSize(1, 1); + if (inventory[0] == null) super.decrStackSize(1, 1); return ret; } } - public void altDecrStackSize (int slot, int quantity) - { - if (inventory[slot] != null) - { - if (inventory[slot].stackSize <= quantity) - { + public void altDecrStackSize(int slot, int quantity) { + if (inventory[slot] != null) { + if (inventory[slot].stackSize <= quantity) { ItemStack stack = inventory[slot]; inventory[slot] = null; return; } ItemStack split = inventory[slot].splitStack(quantity); - if (inventory[slot].stackSize == 0) - { + if (inventory[slot].stackSize == 0) { inventory[slot] = null; } return; @@ -113,51 +90,39 @@ public void altDecrStackSize (int slot, int quantity) } @Override - public boolean canDropInventorySlot (int slot) - { - if (slot == 0) - return true; - else - return false; + public boolean canDropInventorySlot(int slot) { + if (slot == 0) return true; + else return false; } @Override - public int[] getAccessibleSlotsFromSide (int side) - { + public int[] getAccessibleSlotsFromSide(int side) { return new int[0]; } @Override - public boolean canInsertItem (int i, ItemStack itemstack, int j) - { + public boolean canInsertItem(int i, ItemStack itemstack, int j) { return false; } @Override - public boolean canExtractItem (int i, ItemStack itemstack, int j) - { + public boolean canExtractItem(int i, ItemStack itemstack, int j) { return false; } @Override - public String getInventoryName () - { + public String getInventoryName() { return StatCollector.translateToLocal("toolstation.PatternShaper"); } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return true; } @Override - public void closeInventory () - { - } + public void closeInventory() {} @Override - public void openInventory () - { - } -} \ No newline at end of file + public void openInventory() {} +} diff --git a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java index 2d47b371db5..fb1642bb379 100644 --- a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java @@ -11,62 +11,53 @@ /* Simple class for storing items in the block */ -public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory -{ +public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory { ItemStack previousTool; String toolName; - public ToolForgeLogic() - { + public ToolForgeLogic() { super(6); toolName = ""; } @Override - public String getDefaultName () - { + public String getDefaultName() { return "crafters.ToolForge"; } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new ToolForgeContainer(inventoryplayer, this); } @Override - public void buildTool (String name) - { + public void buildTool(String name) { ItemStack output = null; - if (inventory[1] != null) - { - if (inventory[1].getItem() instanceof IModifyable) //Modify item + if (inventory[1] != null) { + if (inventory[1].getItem() instanceof IModifyable) // Modify item { - if (inventory[2] == null && inventory[3] == null && inventory[4] == null) - output = inventory[1].copy(); - else - { - output = ModifyBuilder.instance.modifyItem(inventory[1], new ItemStack[] { inventory[2], inventory[3], inventory[4] }); + if (inventory[2] == null && inventory[3] == null && inventory[4] == null) output = inventory[1].copy(); + else { + output = ModifyBuilder.instance.modifyItem( + inventory[1], new ItemStack[] {inventory[2], inventory[3], inventory[4]}); } - } - else - //Build new item + } else + // Build new item { toolName = name; - ItemStack tool = ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); - if (inventory[0] == null) - output = tool; - else if (tool != null) - { - //NBTTagCompound tags = tool.getTagCompound(); - //if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()).hasKey("Built")) - //{ + ItemStack tool = + ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], inventory[4], name); + if (inventory[0] == null) output = tool; + else if (tool != null) { + // NBTTagCompound tags = tool.getTagCompound(); + // if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()).hasKey("Built")) + // { output = tool; - //} + // } } } - if (!name.equals("")) //Name item - output = tryRenameTool(output, name); + if (!name.equals("")) // Name item + output = tryRenameTool(output, name); } inventory[0] = output; } @@ -85,4 +76,4 @@ else if (tool != null) } } }*/ -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java index 5ea0571de46..6ce86817a63 100644 --- a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -16,129 +16,105 @@ /* Simple class for storing items in the block */ -public class ToolStationLogic extends InventoryLogic implements ISidedInventory -{ +public class ToolStationLogic extends InventoryLogic implements ISidedInventory { public ItemStack previousTool; public String toolName; - public ToolStationLogic() - { + public ToolStationLogic() { super(4); toolName = ""; } - public ToolStationLogic(int slots) - { + public ToolStationLogic(int slots) { super(slots); toolName = ""; } @Override - public boolean canDropInventorySlot (int slot) - { - if (slot == 0) - return false; + public boolean canDropInventorySlot(int slot) { + if (slot == 0) return false; return true; } @Override - public ItemStack getStackInSlotOnClosing (int var1) - { + public ItemStack getStackInSlotOnClosing(int var1) { return null; } @Override - public String getDefaultName () - { + public String getDefaultName() { return "crafters.ToolStation"; } @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { + public Container getGuiContainer(InventoryPlayer inventoryplayer, World world, int x, int y, int z) { return new ToolStationContainer(inventoryplayer, this); } @Override - public void markDirty () - { + public void markDirty() { buildTool(toolName); - if (this.worldObj != null) - { + if (this.worldObj != null) { this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this); } } - public void buildTool (String name) - { + public void buildTool(String name) { ItemStack output = null; - if (inventory[1] != null) - { - if (inventory[1].getItem() instanceof IModifyable) //Modify item + if (inventory[1] != null) { + if (inventory[1].getItem() instanceof IModifyable) // Modify item { - if (inventory[2] == null && inventory[3] == null) - output = inventory[1].copy(); - else - { - output = ModifyBuilder.instance.modifyItem(inventory[1], new ItemStack[] { inventory[2], inventory[3] }); + if (inventory[2] == null && inventory[3] == null) output = inventory[1].copy(); + else { + output = ModifyBuilder.instance.modifyItem( + inventory[1], new ItemStack[] {inventory[2], inventory[3]}); } - } - else - //Build new item + } else + // Build new item { toolName = name; ItemStack tool = ToolBuilder.instance.buildTool(inventory[1], inventory[2], inventory[3], name); - if (inventory[0] == null) - output = tool; - else if (tool != null) - { + if (inventory[0] == null) output = tool; + else if (tool != null) { NBTTagCompound tags = tool.getTagCompound(); - if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()).hasKey("Built")) - { + if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()) + .hasKey("Built")) { output = tool; } } } - if (!name.equals("")) //Name item - output = tryRenameTool(output, name); + if (!name.equals("")) // Name item + output = tryRenameTool(output, name); } inventory[0] = output; } - public void setToolname (String name) - { + public void setToolname(String name) { toolName = name; buildTool(name); } - protected ItemStack tryRenameTool (ItemStack output, String name) - { + protected ItemStack tryRenameTool(ItemStack output, String name) { ItemStack temp; - if (output != null) - temp = output; - else - temp = inventory[1].copy(); + if (output != null) temp = output; + else temp = inventory[1].copy(); if (temp == null) { return null; // output is null or not a tool :( } NBTTagCompound tags = temp.getTagCompound(); - if (tags == null) - { + if (tags == null) { tags = new NBTTagCompound(); temp.setTagCompound(tags); } NBTTagCompound display = null; - if (!(tags.hasKey("display"))) - display = new NBTTagCompound(); - else if (tags.getCompoundTag("display").hasKey("Name")) - display = tags.getCompoundTag("display"); + if (!(tags.hasKey("display"))) display = new NBTTagCompound(); + else if (tags.getCompoundTag("display").hasKey("Name")) display = tags.getCompoundTag("display"); - if (display == null) - return output; + if (display == null) return output; boolean doRename = false; if (canRename(display, temp)) { @@ -147,15 +123,13 @@ else if (tags.getCompoundTag("display").hasKey("Name")) // we only allow renaming with a nametag otherwise else if (!("\u00A7f" + name).equals(display.getString("Name")) && !name.equals(display.getString("Name"))) { int nametagCount = 0; - for(int i = 0; i < inventory.length; i++) - if(inventory[i] != null && inventory[i].getItem() == Items.name_tag) - nametagCount++; + for (int i = 0; i < inventory.length; i++) + if (inventory[i] != null && inventory[i].getItem() == Items.name_tag) nametagCount++; doRename = nametagCount == 1; } - if(!doRename) - return output; + if (!doRename) return output; String dName = temp.getItem() instanceof IModifyable ? "\u00A7f" + name : name; display.setString("Name", dName); @@ -167,52 +141,42 @@ else if (!("\u00A7f" + name).equals(display.getString("Name")) && !name.equals(d } @Override - public boolean canUpdate () - { + public boolean canUpdate() { return false; } @Override - public int[] getAccessibleSlotsFromSide (int side) - { + public int[] getAccessibleSlotsFromSide(int side) { return new int[0]; } @Override - public boolean canInsertItem (int i, ItemStack itemstack, int j) - { + public boolean canInsertItem(int i, ItemStack itemstack, int j) { return false; } @Override - public boolean canExtractItem (int i, ItemStack itemstack, int j) - { + public boolean canExtractItem(int i, ItemStack itemstack, int j) { return false; } @Override - public String getInventoryName () - { + public String getInventoryName() { return "null"; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} public static boolean canRename(NBTTagCompound tags, ItemStack tool) { return !tags.hasKey("Name") || tags.getString("Name").equals("\u00A7f" + ToolBuilder.defaultToolName(tool)); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/model/BattlesignRender.java b/src/main/java/tconstruct/tools/model/BattlesignRender.java index 4046febc780..3ebf465df4a 100644 --- a/src/main/java/tconstruct/tools/model/BattlesignRender.java +++ b/src/main/java/tconstruct/tools/model/BattlesignRender.java @@ -5,55 +5,49 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -public class BattlesignRender implements ISimpleBlockRenderingHandler -{ +public class BattlesignRender implements ISimpleBlockRenderingHandler { public static int battlesignModelID = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { // Inventory should be an item. This is not here! } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { renderer.setRenderBounds(0.45F, 0.0F, 0.45F, 0.55F, 1.125F, 0.55F); renderer.renderStandardBlock(block, x, y, z); renderFace(world, x, y, z, block, renderer); return true; } - public void renderFace (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer) - { - switch (world.getBlockMetadata(x, y, z)) - { - case 0: - renderer.setRenderBounds(0.42F, 0.5F, 0F, 0.50F, 1.1F, 1F); - break; - case 1: - renderer.setRenderBounds(0.50F, 0.5F, 0F, 0.58F, 1.1F, 1F); - break; - case 2: - renderer.setRenderBounds(0F, 0.5F, 0.50F, 1F, 1.1F, 0.58F); - break; - case 3: - renderer.setRenderBounds(0F, 0.5F, 0.42F, 1F, 1.1F, 0.50F); - break; + public void renderFace(IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer) { + switch (world.getBlockMetadata(x, y, z)) { + case 0: + renderer.setRenderBounds(0.42F, 0.5F, 0F, 0.50F, 1.1F, 1F); + break; + case 1: + renderer.setRenderBounds(0.50F, 0.5F, 0F, 0.58F, 1.1F, 1F); + break; + case 2: + renderer.setRenderBounds(0F, 0.5F, 0.50F, 1F, 1.1F, 0.58F); + break; + case 3: + renderer.setRenderBounds(0F, 0.5F, 0.42F, 1F, 1.1F, 0.50F); + break; } renderer.renderStandardBlock(block, x, y, z); } @Override - public boolean shouldRender3DInInventory (int modelid) - { + public boolean shouldRender3DInInventory(int modelid) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return battlesignModelID; } } diff --git a/src/main/java/tconstruct/tools/model/BattlesignTesr.java b/src/main/java/tconstruct/tools/model/BattlesignTesr.java index a3077ba87ab..7b48599c986 100644 --- a/src/main/java/tconstruct/tools/model/BattlesignTesr.java +++ b/src/main/java/tconstruct/tools/model/BattlesignTesr.java @@ -8,11 +8,9 @@ import org.lwjgl.opengl.GL11; import tconstruct.tools.logic.BattlesignLogic; -public class BattlesignTesr extends TileEntitySpecialRenderer -{ +public class BattlesignTesr extends TileEntitySpecialRenderer { - public void renderTileEntityAt (BattlesignLogic te, double x, double y, double z, float something) - { + public void renderTileEntityAt(BattlesignLogic te, double x, double y, double z, float something) { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); @@ -23,34 +21,40 @@ public void renderTileEntityAt (BattlesignLogic te, double x, double y, double z FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - switch (te.getWorldObj().getBlockMetadata(te.xCoord, te.yCoord, te.zCoord)) - { - case 0: - GL11.glRotatef(-90F, 0F, 1F, 0F); - GL11.glTranslatef(5F, -96F, -37F); - break; - case 1: - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-85F, -96F, 53F); - break; - case 2: - GL11.glTranslatef(5F, -96F, 53F); - break; - case 3: - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(-85F, -96F, -37F); - break; + switch (te.getWorldObj().getBlockMetadata(te.xCoord, te.yCoord, te.zCoord)) { + case 0: + GL11.glRotatef(-90F, 0F, 1F, 0F); + GL11.glTranslatef(5F, -96F, -37F); + break; + case 1: + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glTranslatef(-85F, -96F, 53F); + break; + case 2: + GL11.glTranslatef(5F, -96F, 53F); + break; + case 3: + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glTranslatef(-85F, -96F, -37F); + break; } String strings[] = te.getText(); - if (strings != null && strings.length > 0) - { - float lum = calcLuminance(te.getWorldObj().getBlock(te.xCoord, te.yCoord, te.zCoord).colorMultiplier(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord)); + if (strings != null && strings.length > 0) { + float lum = calcLuminance(te.getWorldObj() + .getBlock(te.xCoord, te.yCoord, te.zCoord) + .colorMultiplier(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord)); - for (int i = 0; i < strings.length; i++) - { - fr.drawString((lum >= 35F ? EnumChatFormatting.BLACK : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + strings[i], -fr.getStringWidth(strings[i]) / 2 + 40, 10 * i, 0); + for (int i = 0; i < strings.length; i++) { + fr.drawString( + (lum >= 35F + ? EnumChatFormatting.BLACK + : lum >= 31F ? EnumChatFormatting.GRAY : EnumChatFormatting.WHITE) + + strings[i], + -fr.getStringWidth(strings[i]) / 2 + 40, + 10 * i, + 0); } } @@ -58,8 +62,7 @@ public void renderTileEntityAt (BattlesignLogic te, double x, double y, double z GL11.glPopMatrix(); } - private float calcLuminance (int rgb) - { + private float calcLuminance(int rgb) { int r = (rgb & 0xff0000) >> 16; int g = (rgb & 0xff00) >> 8; int b = (rgb & 0xff); @@ -68,8 +71,7 @@ private float calcLuminance (int rgb) } @Override - public void renderTileEntityAt (TileEntity te, double x, double y, double z, float something) - { + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float something) { this.renderTileEntityAt((BattlesignLogic) te, x, y, z, something); } } diff --git a/src/main/java/tconstruct/tools/model/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java index 1f19308783f..afa7d3a7f7c 100644 --- a/src/main/java/tconstruct/tools/model/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -16,21 +16,22 @@ import org.lwjgl.opengl.*; @SideOnly(Side.CLIENT) -public class FancyItemRender extends Render -{ - private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); +public class FancyItemRender extends Render { + private static final ResourceLocation field_110798_h = + new ResourceLocation("textures/misc/enchanted_item_glint.png"); private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ private Random random = new Random(); + public boolean renderWithColor = true; /** Defines the zLevel of rendering of item on GUI. */ public float zLevel; + public static boolean renderInFrame; - public FancyItemRender() - { + public FancyItemRender() { this.shadowSize = 0.15F; this.shadowOpaque = 0.75F; } @@ -38,17 +39,19 @@ public FancyItemRender() /** * Renders the item */ - public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) - { + public void doRenderItem(EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) { this.bindEntityTexture(par1EntityItem); this.random.setSeed(187L); ItemStack itemstack = par1EntityItem.getEntityItem(); - if (itemstack.getItem() != null) - { + if (itemstack.getItem() != null) { GL11.glPushMatrix(); - float f2 = shouldBob() ? MathHelper.sin(((float) par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F : 0F; - float f3 = (((float) par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI); + float f2 = shouldBob() + ? MathHelper.sin(((float) par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + + 0.1F + : 0F; + float f3 = (((float) par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) + * (180F / (float) Math.PI); byte b0 = getMiniBlockCount(itemstack); GL11.glTranslatef((float) par2, (float) par4 + f2, (float) par6); @@ -62,16 +65,16 @@ public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, d block = Block.getBlockFromItem(itemstack.getItem()); - if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c, 1)) - { + if (ForgeHooksClient.renderEntityItem( + par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c, 1)) { ; - } - else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemstack.getItem()).getRenderType())) - { + } else if (itemstack.getItemSpriteNumber() == 0 + && block != null + && RenderBlocks.renderItemIn3d( + Block.getBlockFromItem(itemstack.getItem()).getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); - if (renderInFrame) - { + if (renderInFrame) { GL11.glScalef(1.25F, 1.25F, 1.25F); GL11.glTranslatef(0.0F, 0.05F, 0.0F); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); @@ -80,19 +83,16 @@ else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.r float f7 = 0.25F; int j = block.getRenderType(); - if (j == 1 || j == 19 || j == 12 || j == 2) - { + if (j == 1 || j == 19 || j == 12 || j == 2) { f7 = 0.5F; } GL11.glScalef(f7, f7, f7); - for (i = 0; i < b0; ++i) - { + for (i = 0; i < b0; ++i) { GL11.glPushMatrix(); - if (i > 0) - { + if (i > 0) { f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; @@ -103,69 +103,51 @@ else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.r this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } - } - else - { + } else { float f8; - if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) - { - if (renderInFrame) - { + if (itemstack.getItemSpriteNumber() == 1 && itemstack.getItem().requiresMultipleRenderPasses()) { + if (renderInFrame) { GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { + } else { GL11.glScalef(0.5F, 0.5F, 0.5F); } - for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) - { + for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { this.random.setSeed(187L); IIcon icon = itemstack.getItem().getIcon(itemstack, k); f8 = 1.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { i = itemstack.getItem().getColorFromItemStack(itemstack, k); f5 = (float) (i >> 16 & 255) / 255.0F; f4 = (float) (i >> 8 & 255) / 255.0F; f6 = (float) (i & 255) / 255.0F; GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); this.renderDroppedItem(par1EntityItem, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8, k); - } - else - { + } else { this.renderDroppedItem(par1EntityItem, icon, b0, par9, 1.0F, 1.0F, 1.0F, k); } } - } - else - { - if (renderInFrame) - { + } else { + if (renderInFrame) { GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { + } else { GL11.glScalef(0.5F, 0.5F, 0.5F); } IIcon icon1 = itemstack.getIconIndex(); - if (this.renderWithColor) - { + if (this.renderWithColor) { int l = itemstack.getItem().getColorFromItemStack(itemstack, 0); f8 = (float) (l >> 16 & 255) / 255.0F; float f9 = (float) (l >> 8 & 255) / 255.0F; f5 = (float) (l & 255) / 255.0F; f4 = 1.0F; this.renderDroppedItem(par1EntityItem, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); - } - else - { + } else { this.renderDroppedItem(par1EntityItem, icon1, b0, par9, 1.0F, 1.0F, 1.0F); } } @@ -176,27 +158,34 @@ else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.r } } - protected ResourceLocation func_110796_a (EntityItem par1EntityItem) - { - return this.renderManager.renderEngine.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); + protected ResourceLocation func_110796_a(EntityItem par1EntityItem) { + return this.renderManager.renderEngine.getResourceLocation( + par1EntityItem.getEntityItem().getItemSpriteNumber()); } /** * Renders a dropped item */ - private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) - { + private void renderDroppedItem( + EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) { renderDroppedItem(par1EntityItem, par2Icon, par3, par4, par5, par6, par7, 0); } - private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) - { + private void renderDroppedItem( + EntityItem par1EntityItem, + IIcon par2Icon, + int par3, + float par4, + float par5, + float par6, + float par7, + int pass) { Tessellator tessellator = Tessellator.instance; - if (par2Icon == null) - { + if (par2Icon == null) { TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - ResourceLocation resourcelocation = texturemanager.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber()); + ResourceLocation resourcelocation = texturemanager.getResourceLocation( + par1EntityItem.getEntityItem().getItemSpriteNumber()); par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } @@ -211,13 +200,15 @@ private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int p GL11.glPushMatrix(); - if (renderInFrame) - { + if (renderInFrame) { GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - else - { - GL11.glRotatef((((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); + } else { + GL11.glRotatef( + (((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) + * (180F / (float) Math.PI), + 0.0F, + 1.0F, + 0.0F); } float f12 = 0.0625F; @@ -228,35 +219,35 @@ private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int p GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); - for (int k = 0; k < b0; ++k) - { + for (int k = 0; k < b0; ++k) { // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug... - if (k > 0 && shouldSpreadItems()) - { + if (k > 0 && shouldSpreadItems()) { float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; GL11.glTranslatef(x, y, f12 + f11); - } - else - { + } else { GL11.glTranslatef(0f, 0f, f12 + f11); } - if (itemstack.getItemSpriteNumber() == 0) - { + if (itemstack.getItemSpriteNumber() == 0) { this.bindTexture(TextureMap.locationBlocksTexture); - } - else - { + } else { this.bindTexture(TextureMap.locationItemsTexture); } GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12); - - if (itemstack.hasEffect(pass)) - { + ItemRenderer.renderItemIn2D( + tessellator, + f5, + f6, + f4, + f7, + ((IIcon) par2Icon).getIconWidth(), + ((IIcon) par2Icon).getIconHeight(), + f12); + + if (itemstack.hasEffect(pass)) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); this.renderManager.renderEngine.bindTexture(field_110798_h); @@ -288,19 +279,27 @@ private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int p } GL11.glPopMatrix(); - } /** * Renders the item's icon or block into the UI at the specified position. */ - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, false); } - public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, boolean renderEffect) - { + public void renderItemIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5, + boolean renderEffect) { Item k = par3ItemStack.getItem(); int l = par3ItemStack.getItemDamage(); Object object = par3ItemStack.getIconIndex(); @@ -309,9 +308,10 @@ public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par float f1; float f2; - Block block = Block.getBlockFromItem(k);//(k < Block.blocksList.length ? Block.blocksList[k] : null); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(block.getRenderType())) - { + Block block = Block.getBlockFromItem(k); // (k < Block.blocksList.length ? Block.blocksList[k] : null); + if (par3ItemStack.getItemSpriteNumber() == 0 + && block != null + && RenderBlocks.renderItemIn3d(block.getRenderType())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); @@ -325,8 +325,7 @@ public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par f1 = (float) (i1 >> 8 & 255) / 255.0F; f2 = (float) (i1 & 255) / 255.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { GL11.glColor4f(f, f1, f2, 1.0F); } @@ -335,44 +334,42 @@ public void renderItemIntoGUI (FontRenderer par1FontRenderer, TextureManager par this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); this.itemRenderBlocks.useInventoryTint = true; GL11.glPopMatrix(); - } - else if (k.requiresMultipleRenderPasses()) - { + } else if (k.requiresMultipleRenderPasses()) { GL11.glDisable(GL11.GL_LIGHTING); - for (int j1 = 0; j1 < k.getRenderPasses(l); ++j1) - { - par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); + for (int j1 = 0; j1 < k.getRenderPasses(l); ++j1) { + par2TextureManager.bindTexture( + par3ItemStack.getItemSpriteNumber() == 0 + ? TextureMap.locationBlocksTexture + : TextureMap.locationItemsTexture); IIcon icon = k.getIcon(par3ItemStack, j1); int k1 = k.getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; f2 = (float) (k1 >> 8 & 255) / 255.0F; float f3 = (float) (k1 & 255) / 255.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { GL11.glColor4f(f1, f2, f3, 1.0F); } this.renderIcon(par4, par5, icon, 16, 16); - if (par3ItemStack.hasEffect(j1)) - { + if (par3ItemStack.hasEffect(j1)) { renderEffect(par2TextureManager, par4, par5); } } GL11.glEnable(GL11.GL_LIGHTING); - } - else - { + } else { GL11.glDisable(GL11.GL_LIGHTING); - ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); + ResourceLocation resourcelocation = + par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber()); par2TextureManager.bindTexture(resourcelocation); - if (object == null) - { - object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno"); + if (object == null) { + object = ((TextureMap) + Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)) + .getAtlasSprite("missingno"); } i1 = k.getColorFromItemStack(par3ItemStack, 0); @@ -380,16 +377,14 @@ else if (k.requiresMultipleRenderPasses()) f1 = (float) (i1 >> 8 & 255) / 255.0F; f2 = (float) (i1 & 255) / 255.0F; - if (this.renderWithColor) - { + if (this.renderWithColor) { GL11.glColor4f(f, f1, f2, 1.0F); } this.renderIcon(par4, par5, (IIcon) object, 16, 16); GL11.glEnable(GL11.GL_LIGHTING); - if (par3ItemStack.hasEffect(0)) - { + if (par3ItemStack.hasEffect(0)) { renderEffect(par2TextureManager, par4, par5); } } @@ -397,8 +392,7 @@ else if (k.requiresMultipleRenderPasses()) GL11.glEnable(GL11.GL_CULL_FACE); } - private void renderEffect (TextureManager manager, int x, int y) - { + private void renderEffect(TextureManager manager, int x, int y) { GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); @@ -418,12 +412,16 @@ private void renderEffect (TextureManager manager, int x, int y) /** * Render the item's icon or block into the GUI, including the glint effect. */ - public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { - if (par3ItemStack != null) - { - if (!ForgeHooksClient.renderInventoryItem(field_147909_c, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5)) - { + public void renderItemAndEffectIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { + if (par3ItemStack != null) { + if (!ForgeHooksClient.renderInventoryItem( + field_147909_c, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) + par5)) { this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true); } @@ -449,37 +447,51 @@ public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, TextureMa } } - private void renderGlint (int par1, int par2, int par3, int par4, int par5) - { - for (int j1 = 0; j1 < 2; ++j1) - { - if (j1 == 0) - { + private void renderGlint(int par1, int par2, int par3, int par4, int par5) { + for (int j1 = 0; j1 < 2; ++j1) { + if (j1 == 0) { GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); } - if (j1 == 1) - { + if (j1 == 1) { GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); } float f = 0.00390625F; float f1 = 0.00390625F; - float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; + float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) + / (3000.0F + (float) (j1 * 1873)) + * 256.0F; float f3 = 0.0F; Tessellator tessellator = Tessellator.instance; float f4 = 4.0F; - if (j1 == 1) - { + if (j1 == 1) { f4 = -1.0F; } tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); - tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + 0), + (double) (par3 + par5), + (double) this.zLevel, + (double) ((f2 + (float) par5 * f4) * f), + (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + par4), + (double) (par3 + par5), + (double) this.zLevel, + (double) ((f2 + (float) par4 + (float) par5 * f4) * f), + (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + par4), + (double) (par3 + 0), + (double) this.zLevel, + (double) ((f2 + (float) par4) * f), + (double) ((f3 + 0.0F) * f1)); + tessellator.addVertexWithUV( + (double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) + ((f3 + 0.0F) * f1)); tessellator.draw(); } } @@ -488,29 +500,42 @@ private void renderGlint (int par1, int par2, int par3, int par4, int par5) * Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the * specified position. */ - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5) - { + public void renderItemOverlayIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5) { this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, (String) null); } - public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureManager par2TextureManager, ItemStack par3ItemStack, int par4, int par5, String par6Str) - { - if (par3ItemStack != null) - { - if (par3ItemStack.stackSize > 1 || par6Str != null) - { + public void renderItemOverlayIntoGUI( + FontRenderer par1FontRenderer, + TextureManager par2TextureManager, + ItemStack par3ItemStack, + int par4, + int par5, + String par6Str) { + if (par3ItemStack != null) { + if (par3ItemStack.stackSize > 1 || par6Str != null) { String s1 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); - par1FontRenderer.drawStringWithShadow(s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); + par1FontRenderer.drawStringWithShadow( + s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); } - if (par3ItemStack.isItemDamaged()) - { - int k = (int) Math.round(13.0D - (double) par3ItemStack.getItemDamageForDisplay() * 13.0D / (double) par3ItemStack.getMaxDamage()); - int l = (int) Math.round(255.0D - (double) par3ItemStack.getItemDamageForDisplay() * 255.0D / (double) par3ItemStack.getMaxDamage()); + if (par3ItemStack.isItemDamaged()) { + int k = (int) Math.round(13.0D + - (double) par3ItemStack.getItemDamageForDisplay() + * 13.0D + / (double) par3ItemStack.getMaxDamage()); + int l = (int) Math.round(255.0D + - (double) par3ItemStack.getItemDamageForDisplay() + * 255.0D + / (double) par3ItemStack.getMaxDamage()); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_TEXTURE_2D); @@ -532,8 +557,7 @@ public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, TextureMana * Adds a quad to the tesselator at the specified position with the set width and height and color. Args: * tessellator, x, y, width, height, color */ - private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) - { + private void renderQuad(Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) { par1Tessellator.startDrawingQuads(); par1Tessellator.setColorOpaque_I(par6); par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); @@ -543,20 +567,29 @@ private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int pa par1Tessellator.draw(); } - public void renderIcon (int par1, int par2, IIcon par3Icon, int par4, int par5) - { + public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMaxV()); - tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMaxV()); - tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMinV()); - tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMinV()); + tessellator.addVertexWithUV( + (double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) + par3Icon.getMaxV()); + tessellator.addVertexWithUV( + (double) (par1 + par4), + (double) (par2 + par5), + (double) this.zLevel, + (double) par3Icon.getMaxU(), + (double) par3Icon.getMaxV()); + tessellator.addVertexWithUV( + (double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) + par3Icon.getMinV()); + tessellator.addVertexWithUV( + (double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) + par3Icon.getMinV()); tessellator.draw(); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((EntityItem) par1Entity); } @@ -567,8 +600,7 @@ protected ResourceLocation getEntityTexture (Entity par1Entity) * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that. */ @Override - public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { this.doRenderItem((EntityItem) par1Entity, par2, par4, par6, par8, par9); } @@ -576,8 +608,7 @@ public void doRender (Entity par1Entity, double par2, double par4, double par6, * Items should spread out when rendered in 3d? * @return */ - public boolean shouldSpreadItems () - { + public boolean shouldSpreadItems() { return true; } @@ -585,22 +616,16 @@ public boolean shouldSpreadItems () * Items should have a bob effect * @return */ - public boolean shouldBob () - { + public boolean shouldBob() { return true; } - public byte getMiniBlockCount (ItemStack stack) - { + public byte getMiniBlockCount(ItemStack stack) { byte ret = 1; - if (stack.stackSize > 1) - ret = 2; - if (stack.stackSize > 5) - ret = 3; - if (stack.stackSize > 20) - ret = 4; - if (stack.stackSize > 40) - ret = 5; + if (stack.stackSize > 1) ret = 2; + if (stack.stackSize > 5) ret = 3; + if (stack.stackSize > 20) ret = 4; + if (stack.stackSize > 40) ret = 5; return ret; } @@ -610,15 +635,11 @@ public byte getMiniBlockCount (ItemStack stack) * @param stack * @return */ - public byte getMiniItemCount (ItemStack stack) - { + public byte getMiniItemCount(ItemStack stack) { byte ret = 1; - if (stack.stackSize > 1) - ret = 2; - if (stack.stackSize > 15) - ret = 3; - if (stack.stackSize > 31) - ret = 4; + if (stack.stackSize > 1) ret = 2; + if (stack.stackSize > 15) ret = 3; + if (stack.stackSize > 31) ret = 4; return ret; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/tools/model/FrypanRender.java b/src/main/java/tconstruct/tools/model/FrypanRender.java index b8e33644867..c71b00246c6 100644 --- a/src/main/java/tconstruct/tools/model/FrypanRender.java +++ b/src/main/java/tconstruct/tools/model/FrypanRender.java @@ -5,19 +5,17 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -public class FrypanRender implements ISimpleBlockRenderingHandler -{ +public class FrypanRender implements ISimpleBlockRenderingHandler { public static int frypanModelID = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { // Inventory should be an item. This is not here! } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F); @@ -34,36 +32,32 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block return true; } - public void renderHandle (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer) - { - switch (world.getBlockMetadata(x, y, z)) - { - case 0: - renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); - break; - case 1: - renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); - break; - case 2: - renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); - break; - case 3: - renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); - break; + public void renderHandle(IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer) { + switch (world.getBlockMetadata(x, y, z)) { + case 0: + renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + break; + case 1: + renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); + break; + case 2: + renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); + break; + case 3: + renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); + break; } renderer.renderStandardBlock(block, x, y, z); } @Override - public boolean shouldRender3DInInventory (int modelid) - { + public boolean shouldRender3DInInventory(int modelid) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return frypanModelID; } } diff --git a/src/main/java/tconstruct/tools/model/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java index cb13f1091b9..398aa569a06 100644 --- a/src/main/java/tconstruct/tools/model/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -7,19 +7,16 @@ import org.lwjgl.opengl.GL11; import tconstruct.tools.TinkerTools; -public class TableRender implements ISimpleBlockRenderingHandler -{ +public class TableRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { // until we get the new model.. finally... - if(block == TinkerTools.toolStationWood && metadata >= 5 && metadata <= 9) { + if (block == TinkerTools.toolStationWood && metadata >= 5 && metadata <= 9) { // pattern chest - renderer.setRenderBounds(0,0,0,1,0.875,1); + renderer.setRenderBounds(0, 0, 0, 1, 0.875, 1); renderStandardInvBlock(renderer, block, metadata); return; } @@ -38,16 +35,15 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { - int metadata = world.getBlockMetadata(x,y,z); + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == model) { + int metadata = world.getBlockMetadata(x, y, z); // until we get the new model.. finally... - if(block == TinkerTools.toolStationWood && metadata >= 5 && metadata <= 9) { + if (block == TinkerTools.toolStationWood && metadata >= 5 && metadata <= 9) { // pattern chest - renderer.setRenderBounds(0,0,0,1,0.875,1); - renderer.renderStandardBlock(block, x,y,z); + renderer.setRenderBounds(0, 0, 0, 1, 0.875, 1); + renderer.renderStandardBlock(block, x, y, z); return true; } @@ -67,19 +63,16 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } - public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta) - { + public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); diff --git a/src/main/java/tconstruct/util/CraftingRecipeHelper.java b/src/main/java/tconstruct/util/CraftingRecipeHelper.java index 9cd9d795961..9992dad398f 100644 --- a/src/main/java/tconstruct/util/CraftingRecipeHelper.java +++ b/src/main/java/tconstruct/util/CraftingRecipeHelper.java @@ -5,89 +5,69 @@ import net.minecraft.item.*; import net.minecraft.item.crafting.*; -public class CraftingRecipeHelper -{ - public static void removeShapedRecipes (List removelist) - { - for (ItemStack stack : removelist) - removeShapedRecipe(stack); +public class CraftingRecipeHelper { + public static void removeShapedRecipes(List removelist) { + for (ItemStack stack : removelist) removeShapedRecipe(stack); } - public static void removeAnyRecipe (ItemStack resultItem) - { + public static void removeAnyRecipe(ItemStack resultItem) { List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { + for (int i = 0; i < recipes.size(); i++) { IRecipe tmpRecipe = recipes.get(i); ItemStack recipeResult = tmpRecipe.getRecipeOutput(); - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) { recipes.remove(i--); } } } - public static void removeShapedRecipe (ItemStack resultItem) - { + public static void removeShapedRecipe(ItemStack resultItem) { List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { + for (int i = 0; i < recipes.size(); i++) { IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapedRecipes) - { + if (tmpRecipe instanceof ShapedRecipes) { ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; ItemStack recipeResult = recipe.getRecipeOutput(); - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) { recipes.remove(i--); } } } } - public static void removeShapelessRecipe (ItemStack resultItem) - { + public static void removeShapelessRecipe(ItemStack resultItem) { List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { + for (int i = 0; i < recipes.size(); i++) { IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapelessRecipes) - { + if (tmpRecipe instanceof ShapelessRecipes) { ShapelessRecipes recipe = (ShapelessRecipes) tmpRecipe; ItemStack recipeResult = recipe.getRecipeOutput(); - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) { recipes.remove(i--); } } } } - public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray) - { + public static void addShapedRecipeFirst(List recipeList, ItemStack itemstack, Object... objArray) { String var3 = ""; int var4 = 0; int var5 = 0; int var6 = 0; - if (objArray[var4] instanceof String[]) - { + if (objArray[var4] instanceof String[]) { String[] var7 = ((String[]) objArray[var4++]); - for (int var8 = 0; var8 < var7.length; ++var8) - { + for (int var8 = 0; var8 < var7.length; ++var8) { String var9 = var7[var8]; ++var6; var5 = var9.length(); var3 = var3 + var9; } - } - else - { - while (objArray[var4] instanceof String) - { + } else { + while (objArray[var4] instanceof String) { String var11 = (String) objArray[var4++]; ++var6; var5 = var11.length(); @@ -97,21 +77,15 @@ public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, O HashMap var12; - for (var12 = new HashMap(); var4 < objArray.length; var4 += 2) - { + for (var12 = new HashMap(); var4 < objArray.length; var4 += 2) { Character var13 = (Character) objArray[var4]; ItemStack var14 = null; - if (objArray[var4 + 1] instanceof Item) - { + if (objArray[var4 + 1] instanceof Item) { var14 = new ItemStack((Item) objArray[var4 + 1]); - } - else if (objArray[var4 + 1] instanceof Block) - { + } else if (objArray[var4 + 1] instanceof Block) { var14 = new ItemStack((Block) objArray[var4 + 1], 1, Short.MAX_VALUE); - } - else if (objArray[var4 + 1] instanceof ItemStack) - { + } else if (objArray[var4 + 1] instanceof ItemStack) { var14 = (ItemStack) objArray[var4 + 1]; } @@ -120,16 +94,12 @@ else if (objArray[var4 + 1] instanceof ItemStack) ItemStack[] var15 = new ItemStack[var5 * var6]; - for (int var16 = 0; var16 < var5 * var6; ++var16) - { + for (int var16 = 0; var16 < var5 * var6; ++var16) { char var10 = var3.charAt(var16); - if (var12.containsKey(Character.valueOf(var10))) - { + if (var12.containsKey(Character.valueOf(var10))) { var15[var16] = ((ItemStack) var12.get(Character.valueOf(var10))).copy(); - } - else - { + } else { var15[var16] = null; } } diff --git a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java index d8ac3e732e7..122590fdf4f 100644 --- a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java +++ b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java @@ -3,19 +3,15 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.*; -public class DamageSourceFireworkExplode extends DamageSource -{ +public class DamageSourceFireworkExplode extends DamageSource { - public DamageSourceFireworkExplode(String s) - { + public DamageSourceFireworkExplode(String s) { super(s); this.setDamageBypassesArmor(); } @Override - public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase) - { + public IChatComponent func_151519_b(EntityLivingBase par1EntityLivingBase) { return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_()); } - } diff --git a/src/main/java/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java index 4bd52e9cd0f..dba82050cd0 100644 --- a/src/main/java/tconstruct/util/DamageSourceLandmine.java +++ b/src/main/java/tconstruct/util/DamageSourceLandmine.java @@ -3,18 +3,15 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.*; -public class DamageSourceLandmine extends DamageSource -{ +public class DamageSourceLandmine extends DamageSource { - public DamageSourceLandmine(String s) - { + public DamageSourceLandmine(String s) { super(s); this.setDamageBypassesArmor(); } @Override - public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase) - { + public IChatComponent func_151519_b(EntityLivingBase par1EntityLivingBase) { return new ChatComponentTranslation("death.attack.Landmine", par1EntityLivingBase.func_145748_c_()); } } diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index 8d11a922ab2..d466edbff46 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -5,14 +5,10 @@ import java.util.*; import mantle.crash.*; import net.minecraftforge.common.MinecraftForge; -import tconstruct.TConstruct; -public class EnvironmentChecks -{ +public class EnvironmentChecks { - private EnvironmentChecks() - { - } // Singleton + private EnvironmentChecks() {} // Singleton /** * Checks for conflicting stuff in environment; adds callable to any crash @@ -20,36 +16,30 @@ private EnvironmentChecks() * not trigger any crashes. */ private static List incompatibilities = new ArrayList(); + private static EnvironmentChecks instance = new EnvironmentChecks(); - public static void verifyEnvironmentSanity () - { + public static void verifyEnvironmentSanity() { List modIds = new ArrayList(); // Bukkit/Magic Launcher/Optifine are caught by Mantle, so we no longer // check for those. - if (modIds.size() == 0) - { + if (modIds.size() == 0) { ICrashCallable callable = new CallableSuppConfig("TConstruct"); FMLCommonHandler.instance().registerCrashCallable(callable); - } - else - { + } else { ICrashCallable callable = new CallableUnsuppConfig("TConstruct", modIds); FMLCommonHandler.instance().registerCrashCallable(callable); } - if (incompatibilities.size() > 0 && FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - { + if (incompatibilities.size() > 0 && FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { MinecraftForge.EVENT_BUS.register(instance); } } - public static String modCompatDetails (String type, boolean consoleFormat) - { + public static String modCompatDetails(String type, boolean consoleFormat) { String n = consoleFormat ? System.getProperty("line.separator") : "\n"; return ""; } - } diff --git a/src/main/java/tconstruct/util/IMCHandler.java b/src/main/java/tconstruct/util/IMCHandler.java index e2f208ca2ff..10b6623f688 100644 --- a/src/main/java/tconstruct/util/IMCHandler.java +++ b/src/main/java/tconstruct/util/IMCHandler.java @@ -4,14 +4,14 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.event.FMLInterModComms; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import org.apache.logging.log4j.Level; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; @@ -25,26 +25,17 @@ import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - public final class IMCHandler { private IMCHandler() {} - public static void processIMC(List messages) - { - for(FMLInterModComms.IMCMessage message : messages) - { + public static void processIMC(List messages) { + for (FMLInterModComms.IMCMessage message : messages) { String type = message.key; - if(type == null || type.isEmpty()) - continue; + if (type == null || type.isEmpty()) continue; // process materials added from mods - if(type.equals("addMaterial")) - { - if(!message.isNBTMessage()) - { + if (type.equals("addMaterial")) { + if (!message.isNBTMessage()) { logInvalidMessage(message); continue; } @@ -52,14 +43,13 @@ public static void processIMC(List messages) NBTTagCompound tag = message.getNBTValue(); int id = tag.getInteger("Id"); ToolMaterial mat = scanMaterial(tag); - if(mat != null) { + if (mat != null) { TConstructRegistry.addtoolMaterial(id, mat); TConstructRegistry.addDefaultToolPartMaterial(id); TConstruct.logger.debug("IMC: Added material " + mat.materialName); // bow stats - if(tag.hasKey("Bow_DrawSpeed") && tag.hasKey("Bow_ProjectileSpeed")) - { + if (tag.hasKey("Bow_DrawSpeed") && tag.hasKey("Bow_ProjectileSpeed")) { int drawspeed = tag.getInteger("Bow_DrawSpeed"); float flightspeed = tag.getFloat("Bow_ProjectileSpeed"); @@ -67,8 +57,7 @@ public static void processIMC(List messages) TConstruct.logger.debug("IMC: Added Bow stats for material " + mat.materialName); } // arrow stats - if(tag.hasKey("Projectile_Mass") && tag.hasKey("Projectile_Fragility")) - { + if (tag.hasKey("Projectile_Mass") && tag.hasKey("Projectile_Fragility")) { float mass = tag.getFloat("Projectile_Mass"); float breakchance = tag.getFloat("Projectile_Fragility"); @@ -76,28 +65,25 @@ public static void processIMC(List messages) TConstruct.logger.debug("IMC: Added Projectile stats for material " + mat.materialName); } - // add additional render mapping so resource packs or the mods themselves can have custom textures for the tools - if(FMLCommonHandler.instance().getSide().isClient()) - TConstructClientRegistry.addMaterialRenderMapping(id, "tinker", mat.name().toLowerCase(), true); + // add additional render mapping so resource packs or the mods themselves can have custom textures + // for the tools + if (FMLCommonHandler.instance().getSide().isClient()) + TConstructClientRegistry.addMaterialRenderMapping( + id, "tinker", mat.name().toLowerCase(), true); } - } - else if(type.equals("addPartBuilderMaterial")) - { - if(!message.isNBTMessage()) - { + } else if (type.equals("addPartBuilderMaterial")) { + if (!message.isNBTMessage()) { logInvalidMessage(message); continue; } NBTTagCompound tag = message.getNBTValue(); - if(!checkRequiredTags("PartBuilder", tag, "MaterialId", "Item", "Value")) - continue; + if (!checkRequiredTags("PartBuilder", tag, "MaterialId", "Item", "Value")) continue; int matID = tag.getInteger("MaterialId"); int value = tag.getInteger("Value"); - if(TConstructRegistry.getMaterial(matID) == null) - { + if (TConstructRegistry.getMaterial(matID) == null) { FMLLog.bigWarning("PartBuilder IMC: Unknown Material ID " + matID); continue; } @@ -107,30 +93,27 @@ else if(type.equals("addPartBuilderMaterial")) ItemStack rod = new ItemStack(TinkerTools.toolRod, 1, matID); // default shard if none present. Has to exist because old code. - if(shard == null) - { + if (shard == null) { TConstructRegistry.addDefaultShardMaterial(matID); shard = new ItemStack(TinkerTools.toolShard, 1, matID); } // register the material - PatternBuilder.instance.registerFullMaterial(item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID); + PatternBuilder.instance.registerFullMaterial( + item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID); List addItems = new LinkedList(); List addMetas = new LinkedList(); List addOUtputs = new LinkedList(); // add mappings for everything that has stone tool mappings - for(Map.Entry mappingEntry : TConstructRegistry.patternPartMapping.entrySet()) - { + for (Map.Entry mappingEntry : TConstructRegistry.patternPartMapping.entrySet()) { List mapping = mappingEntry.getKey(); // only stone mappings - if((Integer)mapping.get(2) != TinkerTools.MaterialID.Stone) - continue; + if ((Integer) mapping.get(2) != TinkerTools.MaterialID.Stone) continue; // only if the output is a dynamic part - if(!(mappingEntry.getValue().getItem() instanceof DynamicToolPart)) - continue; + if (!(mappingEntry.getValue().getItem() instanceof DynamicToolPart)) continue; Item woodPattern = (Item) mapping.get(0); Integer meta = (Integer) mapping.get(1); @@ -145,138 +128,124 @@ else if(type.equals("addPartBuilderMaterial")) } // add a part mapping for it - for(int i = 0; i < addItems.size(); i++) + for (int i = 0; i < addItems.size(); i++) TConstructRegistry.addPartMapping(addItems.get(i), addMetas.get(i), matID, addOUtputs.get(i)); - - TConstruct.logger.debug("PartBuilder IMC: Added Part builder mapping for " + TConstructRegistry.getMaterial(matID).materialName); - } - else if(type.equals("addPartCastingMaterial")) - { - if(!message.isNBTMessage()) - { + TConstruct.logger.debug("PartBuilder IMC: Added Part builder mapping for " + + TConstructRegistry.getMaterial(matID).materialName); + } else if (type.equals("addPartCastingMaterial")) { + if (!message.isNBTMessage()) { logInvalidMessage(message); continue; } NBTTagCompound tag = message.getNBTValue(); - if(!checkRequiredTags("Casting", tag, "MaterialId", "FluidName")) - continue; + if (!checkRequiredTags("Casting", tag, "MaterialId", "FluidName")) continue; - if(!tag.hasKey("MaterialId")) - { + if (!tag.hasKey("MaterialId")) { FMLLog.bigWarning("Casting IMC: Not material ID for the result present"); continue; } int matID = tag.getInteger("MaterialId"); FluidStack liquid = FluidStack.loadFluidStackFromNBT(tag); - if(liquid == null) { + if (liquid == null) { FMLLog.bigWarning("Casting IMC: No fluid found"); continue; } - if(TConstructRegistry.getMaterial(matID) == null) - { + if (TConstructRegistry.getMaterial(matID) == null) { FMLLog.bigWarning("Casting IMC: Unknown Material ID " + matID); continue; } // we add the toolpart to all smeltery recipies that use iron and create a toolpart List newRecipies = new LinkedList(); - for(CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) - { - if(recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid) - continue; - if(recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern)) - continue; - if(!(recipe.getResult().getItem() instanceof DynamicToolPart)) // has to be dynamic toolpart to support automatic addition - continue; + for (CastingRecipe recipe : TConstructRegistry.getTableCasting().getCastingRecipes()) { + if (recipe.castingMetal.getFluid() != TinkerSmeltery.moltenIronFluid) continue; + if (recipe.cast == null || !(recipe.cast.getItem() instanceof IPattern)) continue; + if (!(recipe.getResult().getItem() + instanceof DynamicToolPart)) // has to be dynamic toolpart to support automatic addition + continue; newRecipies.add(recipe); } FluidType ft = FluidType.getFluidType(liquid.getFluid()); - if(ft == null) { + if (ft == null) { ft = new FluidType(TinkerSmeltery.glueBlock, 0, 500, liquid.getFluid(), true); FluidType.registerFluidType(liquid.getFluid().getName(), ft); } // has to be done separately so we have all checks and no concurrent modification exception - for(CastingRecipe recipe : newRecipies) - { + for (CastingRecipe recipe : newRecipies) { ItemStack output = recipe.getResult().copy(); output.setItemDamage(matID); FluidStack liquid2 = new FluidStack(liquid, recipe.castingMetal.amount); // ok, this recipe creates a toolpart and uses iron for it. add a new one for the IMC stuff! - TConstructRegistry.getTableCasting().addCastingRecipe(output, liquid2, recipe.cast, recipe.consumeCast, recipe.coolTime); + TConstructRegistry.getTableCasting() + .addCastingRecipe(output, liquid2, recipe.cast, recipe.consumeCast, recipe.coolTime); // and make it melt! Smeltery.addMelting(ft, output, 0, liquid2.amount); } TConstruct.logger.debug("Casting IMC: Added fluid " + tag.getString("FluidName") + " to part casting"); - } - else if(type.equals("addMaterialItem")) { - if(!message.isNBTMessage()) { + } else if (type.equals("addMaterialItem")) { + if (!message.isNBTMessage()) { logInvalidMessage(message); continue; } NBTTagCompound tag = message.getNBTValue(); - if (!checkRequiredTags("Material Item", tag, "MaterialId", "Value", "Item")) - continue; + if (!checkRequiredTags("Material Item", tag, "MaterialId", "Value", "Item")) continue; int id = tag.getInteger("MaterialId"); int value = tag.getInteger("Value"); ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Item")); - if(stack == null) { + if (stack == null) { FMLLog.bigWarning("Material Item IMC: Item for Material %d is null", id); continue; } - if(TConstructRegistry.getMaterial(id) == null) { + if (TConstructRegistry.getMaterial(id) == null) { FMLLog.bigWarning("Material Item IMC: Material with ID %d does not exist", id); continue; } - ToolMaterial mat = TConstructRegistry.getMaterial(id); // we already have the material registered in there - if(PatternBuilder.instance.materialSets.containsKey(mat.materialName)) - { + if (PatternBuilder.instance.materialSets.containsKey(mat.materialName)) { PatternBuilder.instance.registerMaterial(stack, value, mat.materialName); - } - else { + } else { TConstructRegistry.addDefaultShardMaterial(id); ItemStack shard = new ItemStack(TinkerTools.toolShard, 1, id); ItemStack rod = new ItemStack(TinkerTools.toolRod, 1, id); // register the material - PatternBuilder.instance.registerFullMaterial(stack, value, TConstructRegistry.getMaterial(id).materialName, shard, rod, id); + PatternBuilder.instance.registerFullMaterial( + stack, value, TConstructRegistry.getMaterial(id).materialName, shard, rod, id); } - } - else if(type.equals("addSmelteryMelting")) { + } else if (type.equals("addSmelteryMelting")) { if (!message.isNBTMessage()) { logInvalidMessage(message); continue; } NBTTagCompound tag = message.getNBTValue(); - if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Item", "Block")) - continue; + if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Item", "Block")) continue; FluidStack liquid = FluidStack.loadFluidStackFromNBT(tag); - if(liquid == null) { + if (liquid == null) { FMLLog.bigWarning("Smeltery IMC: No fluid found"); continue; } - if(liquid.amount <= 0) { + if (liquid.amount <= 0) { FMLLog.bigWarning("Smeltery IMC: Liquid has to have an amount greater than zero"); continue; } @@ -284,25 +253,31 @@ else if(type.equals("addSmelteryMelting")) { ItemStack item = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Item")); ItemStack block = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Block")); int temperature = tag.getInteger("Temperature"); - - if(FluidType.getFluidType(liquid.getFluid()) == null) - FluidType.registerFluidType(liquid.getFluid().getName(), Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid.getFluid(), false); - Smeltery.addMelting(item, Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid); - TConstruct.logger.debug("Smeltery IMC: Added melting: " + item.getDisplayName() + " to " + liquid.amount + "mb " + liquid.getLocalizedName()); - } - else if(type.equals("addSmelteryFuel")) { + if (FluidType.getFluidType(liquid.getFluid()) == null) + FluidType.registerFluidType( + liquid.getFluid().getName(), + Block.getBlockFromItem(block.getItem()), + block.getItemDamage(), + temperature, + liquid.getFluid(), + false); + + Smeltery.addMelting( + item, Block.getBlockFromItem(block.getItem()), block.getItemDamage(), temperature, liquid); + TConstruct.logger.debug("Smeltery IMC: Added melting: " + item.getDisplayName() + " to " + liquid.amount + + "mb " + liquid.getLocalizedName()); + } else if (type.equals("addSmelteryFuel")) { if (!message.isNBTMessage()) { logInvalidMessage(message); continue; } NBTTagCompound tag = message.getNBTValue(); - if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Duration")) - continue; + if (!checkRequiredTags("Smeltery", tag, "FluidName", "Temperature", "Duration")) continue; FluidStack liquid = FluidStack.loadFluidStackFromNBT(tag); - if(liquid == null) { + if (liquid == null) { FMLLog.bigWarning("Smeltery IMC: No fluid found"); continue; } @@ -312,7 +287,8 @@ else if(type.equals("addSmelteryFuel")) { Smeltery.addSmelteryFuel(liquid.getFluid(), temperature, duration); - TConstruct.logger.debug("Smeltery IMC: Added fuel: " + liquid.getLocalizedName() + " (" + temperature + ", " + duration + ")"); + TConstruct.logger.debug("Smeltery IMC: Added fuel: " + liquid.getLocalizedName() + " (" + temperature + + ", " + duration + ")"); } else if (type.equals("addFluxBattery")) { if (!message.isItemStackMessage()) { logInvalidMessage(message, "ItemStack"); @@ -321,7 +297,7 @@ else if(type.equals("addSmelteryFuel")) { ItemStack battery = message.getItemStackValue(); battery.stackSize = 1; // avoid getting a stack size of 0 or larger than 1 - if(!(battery.getItem() instanceof IEnergyContainerItem)) { + if (!(battery.getItem() instanceof IEnergyContainerItem)) { FMLLog.bigWarning("Flux Battery IMC: ItemStack is no instance of IEnergyContainerItem"); } @@ -332,12 +308,10 @@ else if(type.equals("addSmelteryFuel")) { } } - private static boolean checkRequiredTags(String prefix, NBTTagCompound tag, String... tags) - { + private static boolean checkRequiredTags(String prefix, NBTTagCompound tag, String... tags) { boolean ok = true; - for(String t : tags) - if(!tag.hasKey(t)) - { + for (String t : tags) + if (!tag.hasKey(t)) { FMLLog.bigWarning(String.format("%s IMC: Missing required NBT Tag %s", prefix, t)); ok = false; // don't abort, report all missing tags } @@ -345,37 +319,32 @@ private static boolean checkRequiredTags(String prefix, NBTTagCompound tag, Stri return ok; } - private static void logInvalidMessage(FMLInterModComms.IMCMessage message) - { + private static void logInvalidMessage(FMLInterModComms.IMCMessage message) { logInvalidMessage(message, "NBT"); } - private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type) - { - FMLLog.bigWarning(String.format("Received invalid IMC '%s' from %s. Not a %s Message.", message.key, message.getSender(), type)); + private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type) { + FMLLog.bigWarning(String.format( + "Received invalid IMC '%s' from %s. Not a %s Message.", message.key, message.getSender(), type)); } - private static ToolMaterial scanMaterial(NBTTagCompound tag) - { - if(!tag.hasKey("Name")) { + private static ToolMaterial scanMaterial(NBTTagCompound tag) { + if (!tag.hasKey("Name")) { FMLLog.bigWarning("Material IMC: Material has no name"); return null; } String name = tag.getString("Name"); - if(!tag.hasKey("Id")) { + if (!tag.hasKey("Id")) { FMLLog.bigWarning("Material IMC: Materials need a unique id. " + name); return null; - } - else if(!tag.hasKey("Durability")) { + } else if (!tag.hasKey("Durability")) { FMLLog.bigWarning("Material IMC: Materials need a durability. " + name); return null; - } - else if(!tag.hasKey("MiningSpeed")) { + } else if (!tag.hasKey("MiningSpeed")) { FMLLog.bigWarning("Material IMC: Materials need a mining speed. " + name); return null; - } - else if(tag.hasKey("Stonebound") && tag.hasKey("Jagged")) { + } else if (tag.hasKey("Stonebound") && tag.hasKey("Jagged")) { FMLLog.bigWarning("Material IMC: Materials can only be Stonebound or Jagged. " + name); return null; } @@ -390,23 +359,30 @@ else if(tag.hasKey("Stonebound") && tag.hasKey("Jagged")) { String style = tag.getString("Style"); int color = tag.getInteger("Color"); - if(tag.hasKey("Jagged")) - shoddy = -tag.getFloat("Jagged"); - - if(tag.hasKey("localizationString")) - return new ToolMaterial(name, tag.getString("localizationString"), hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color); - else - return new ToolMaterial(name, hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color); + if (tag.hasKey("Jagged")) shoddy = -tag.getFloat("Jagged"); + + if (tag.hasKey("localizationString")) + return new ToolMaterial( + name, + tag.getString("localizationString"), + hlvl, + durability, + speed, + attack, + handle, + reinforced, + shoddy, + style, + color); + else return new ToolMaterial(name, hlvl, durability, speed, attack, handle, reinforced, shoddy, style, color); } // basically FMLLog.bigWarning - public static void bigWarning(String format, Object... data) - { + public static void bigWarning(String format, Object... data) { StackTraceElement[] trace = Thread.currentThread().getStackTrace(); TConstruct.logger.error("**********************************************************************"); TConstruct.logger.error(String.format("* " + format, data)); - for (int i = 2; i < 8 && i < trace.length; i++) - { + for (int i = 2; i < 8 && i < trace.length; i++) { TConstruct.logger.error(String.format("* at %s%s", trace[i].toString(), i == 7 ? "..." : "")); } TConstruct.logger.error("**********************************************************************"); diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java index f8c860f0afa..805769ba391 100644 --- a/src/main/java/tconstruct/util/ItemHelper.java +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -12,35 +12,32 @@ import org.lwjgl.opengl.GL11; import tconstruct.TConstruct; -public class ItemHelper -{ - public static Object getStaticItem (String name, String classPackage) - { - try - { +public class ItemHelper { + public static Object getStaticItem(String name, String classPackage) { + try { Class clazz = Class.forName(classPackage); Field field = clazz.getDeclaredField(name); Object ret = field.get(null); - if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) - return ret; + if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) return ret; return null; - } - catch (Exception e) - { + } catch (Exception e) { TConstruct.logger.warn("Could not find " + name + "from " + classPackage); return null; } } - public static void addDrops (LivingDropsEvent event, ItemStack dropStack) - { - EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); + public static void addDrops(LivingDropsEvent event, ItemStack dropStack) { + EntityItem entityitem = new EntityItem( + event.entityLiving.worldObj, + event.entityLiving.posX, + event.entityLiving.posY, + event.entityLiving.posZ, + dropStack); entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); } - public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta) - { + public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); @@ -49,7 +46,8 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, ItemHelper.getIconSafe(block.getIcon(1, meta)));// block.getIcon(1, meta)); + renderblocks.renderFaceYPos( + block, 0.0D, 0.0D, 0.0D, ItemHelper.getIconSafe(block.getIcon(1, meta))); // block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); @@ -70,8 +68,7 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc GL11.glTranslatef(0.5F, 0.5F, 0.5F); } - public static void renderInvBlockFace (RenderBlocks renderblocks, Block block, int meta) - { + public static void renderInvBlockFace(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glScalef(2f, 2f, 2f); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); @@ -104,10 +101,9 @@ public static void renderInvBlockFace (RenderBlocks renderblocks, Block block, i GL11.glTranslatef(0.5F, 0.5F, 0.5F); } - public static IIcon getIconSafe (IIcon icon) - { - if (icon != null) - return icon; - return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); + public static IIcon getIconSafe(IIcon icon) { + if (icon != null) return icon; + return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)) + .getAtlasSprite("missingno"); } } diff --git a/src/main/java/tconstruct/util/Reference.java b/src/main/java/tconstruct/util/Reference.java index ccbccbd822d..7e6308615fa 100644 --- a/src/main/java/tconstruct/util/Reference.java +++ b/src/main/java/tconstruct/util/Reference.java @@ -10,9 +10,11 @@ private Reference() {} public static final String RESOURCE = "tinker"; - public static String resource(String res) - { + public static String resource(String res) { return String.format("%s:%s", RESOURCE, res); } - public static String prefix(String name) { return String.format("tconstruct.%s", name);} + + public static String prefix(String name) { + return String.format("tconstruct.%s", name); + } } diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index a0c55c86684..238bf371052 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -6,98 +6,76 @@ import net.minecraftforge.common.config.Configuration; import tconstruct.TConstruct; -public class DimensionBlacklist -{ +public class DimensionBlacklist { public static ArrayList blacklistedDims = new ArrayList(); public static ArrayList noPoolDims = new ArrayList(); public static int promisedLandDimensionID = -100; public static int twilightForestDimensionID = -100; - public static void getBadBimensions () - { + public static void getBadBimensions() { updateModDimIDs(); blacklistedDims.add(1); - if (twilightForestDimensionID != -100) - { + if (twilightForestDimensionID != -100) { blacklistedDims.add(twilightForestDimensionID); } - if (PHConstruct.cfgDimBlackList.length > 0) - { - for (int numdim = 0; numdim < PHConstruct.cfgDimBlackList.length; numdim++) - { + if (PHConstruct.cfgDimBlackList.length > 0) { + for (int numdim = 0; numdim < PHConstruct.cfgDimBlackList.length; numdim++) { blacklistedDims.add(PHConstruct.cfgDimBlackList[numdim]); } } - if (promisedLandDimensionID != -100) - { + if (promisedLandDimensionID != -100) { noPoolDims.add(promisedLandDimensionID); } } - public static boolean isDimInBlacklist (int dim) - { - if (dim < 0) - return false; - if (dim == 0) - return PHConstruct.slimeIslGenDim0; - if (PHConstruct.slimeIslGenDim0Only) - { + public static boolean isDimInBlacklist(int dim) { + if (dim < 0) return false; + if (dim == 0) return PHConstruct.slimeIslGenDim0; + if (PHConstruct.slimeIslGenDim0Only) { return false; } - for (int len = 0; len < blacklistedDims.size(); len++) - { - if (blacklistedDims.get(len) == dim) - return false; + for (int len = 0; len < blacklistedDims.size(); len++) { + if (blacklistedDims.get(len) == dim) return false; } return true; - } - public static boolean isDimNoPool (int dim) - { + public static boolean isDimNoPool(int dim) { return noPoolDims.contains(dim); } - private static void updateModDimIDs () - { + private static void updateModDimIDs() { updateTwiForestID(); updateBoPID(); } - private static void updateTwiForestID () - { + private static void updateTwiForestID() { String location = Loader.instance().getConfigDir().getPath(); File newFile = new File(location + File.separator + "TwilightForest.cfg"); - if (newFile.exists()) - { + if (newFile.exists()) { Configuration config = new Configuration(newFile); config.load(); - twilightForestDimensionID = config.get("dimension", "dimensionID", -100).getInt(); + twilightForestDimensionID = + config.get("dimension", "dimensionID", -100).getInt(); TConstruct.logger.trace("Twilight Forest Dim ID: " + twilightForestDimensionID); - } - else - twilightForestDimensionID = -100; + } else twilightForestDimensionID = -100; } - private static void updateBoPID () - { + private static void updateBoPID() { String location = Loader.instance().getConfigDir().getPath(); File newFile = new File(location + File.separator + "biomesoplenty" + File.separator + "ids.cfg"); - if (newFile.exists()) - { + if (newFile.exists()) { Configuration config = new Configuration(newFile); config.load(); - promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200).getInt(); + promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200) + .getInt(); TConstruct.logger.trace("Promised Lands Dim ID: " + promisedLandDimensionID); - } - else - promisedLandDimensionID = -100; + } else promisedLandDimensionID = -100; } - } diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 54bc6a828c8..1d0a0613318 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -1,21 +1,17 @@ package tconstruct.util.config; import com.google.common.collect.Sets; +import java.io.File; +import java.util.Set; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; -import java.io.File; -import java.util.Set; - -public class PHConstruct -{ +public class PHConstruct { - - public static void initProps (File location) - { + public static void initProps(File location) { /* Here we will set up the config file for the mod * First: Create a folder inside the config folder @@ -25,120 +21,192 @@ public static void initProps (File location) File mainFile = new File(location + "/TinkersConstruct.cfg"); File legacyFile16 = new File(location + "/TinkersWorkshop.txt"); File legacyFile17 = new File(location + "/TConstruct.cfg"); - try - { - if (!mainFile.exists()) - { - if (legacyFile16.exists()) - legacyFile16.renameTo(mainFile); - if (legacyFile17.exists()) - legacyFile17.renameTo(mainFile); + try { + if (!mainFile.exists()) { + if (legacyFile16.exists()) legacyFile16.renameTo(mainFile); + if (legacyFile17.exists()) legacyFile17.renameTo(mainFile); } - } - catch (Exception e) - { + } catch (Exception e) { TConstruct.logger.warn("Could not update legacy configuration file for TConstruct. Reason:"); TConstruct.logger.warn(e.getLocalizedMessage()); } Configuration config = new Configuration(mainFile); - //config.load(); /* Load happens in the constructor */ - - superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false); - - keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); - keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); - beginnerBook = config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); - deathPenality = config.get("Difficulty Changes", "Tools lose 10% durability on death", true).getBoolean(true); - balancedFluxModifier = config.get("Difficulty Changes", "Balanced Flux Modifier", true).getBoolean(true); - - enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true).getBoolean(true); - enableTStone = config.get("Difficulty Changes", "Enable mod stone tools", true).getBoolean(true); - enableTCactus = config.get("Difficulty Changes", "Enable mod cactus tools", true).getBoolean(true); - enableTBone = config.get("Difficulty Changes", "Enable mod bone tools", true).getBoolean(true); - enableTFlint = config.get("Difficulty Changes", "Enable mod flint tools", true).getBoolean(true); - enableTNetherrack = config.get("Difficulty Changes", "Enable mod netherrack tools", true).getBoolean(true); - enableTSlime = config.get("Difficulty Changes", "Enable mod slime tools", true).getBoolean(true); - enableTPaper = config.get("Difficulty Changes", "Enable mod paper tools", true).getBoolean(true); - enableTBlueSlime = config.get("Difficulty Changes", "Enable mod blue slime tools", true).getBoolean(true); - - craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false).getBoolean(false); - vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true).getBoolean(true); - lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true).getBoolean(true); - removeGoldCastRecipes = config.get("Difficulty Changes", "Remove Gold Cast Recipes", true).getBoolean(true); - removeVanillaToolRecipes = config.get("Difficulty Changes", "Remove Vanilla Tool Recipes", false).getBoolean(false); - labotimizeVanillaTools = config.get("Difficulty Changes", "Remove Vanilla Tool Effectiveness", false).getBoolean(false); - miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); - denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); - craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true).getBoolean(true); - alternativeBoltRecipe = config.get("Difficulty Changes", "Add alternative recipe for bolt parts: arrowhead + toolrod in a crafting grid", false).getBoolean(false); - - naturalSlimeSpawn = config.get("Mobs", "Blue Slime spawn chance", 1, "Set to 0 to disable").getInt(1); - - ingotsPerOre = config.get("Smeltery Output Modification", "Ingots per ore", 2, "Number of ingots returned from smelting ores in the smeltery").getDouble(2); - ingotsBronzeAlloy = config.get("Smeltery Output Modification", "Bronze ingot return", 4, "Number of ingots returned from smelting Bronze in the smeltery").getDouble(4); - ingotsAluminumBrassAlloy = config.get("Smeltery Output Modification", "Aluminum Brass ingot return", 4, "Number of ingots returned from smelting Aluminum Brass in the smeltery").getDouble(4); - ingotsAlumiteAlloy = config.get("Smeltery Output Modification", "Alumite ingot return", 3, "Number of ingots returned from smelting Alumite in the smeltery").getDouble(3); - ingotsManyullynAlloy = config.get("Smeltery Output Modification", "Manyullyn ingot return", 1, "Number of ingots returned from smelting Manyullyn in the smeltery").getDouble(1); - ingotsPigironAlloy = config.get("Smeltery Output Modification", "Pig Iron ingot return", 1, "Number of ingots returned from smelting Pig Iron in the smeltery").getDouble(1); + // config.load(); /* Load happens in the constructor */ + + superfunWorld = + config.get("Superfun", "All the world is Superfun", false).getBoolean(false); + + keepHunger = + config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); + keepLevels = + config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); + beginnerBook = + config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); + deathPenality = config.get("Difficulty Changes", "Tools lose 10% durability on death", true) + .getBoolean(true); + balancedFluxModifier = + config.get("Difficulty Changes", "Balanced Flux Modifier", true).getBoolean(true); + + enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true) + .getBoolean(true); + enableTStone = + config.get("Difficulty Changes", "Enable mod stone tools", true).getBoolean(true); + enableTCactus = config.get("Difficulty Changes", "Enable mod cactus tools", true) + .getBoolean(true); + enableTBone = + config.get("Difficulty Changes", "Enable mod bone tools", true).getBoolean(true); + enableTFlint = + config.get("Difficulty Changes", "Enable mod flint tools", true).getBoolean(true); + enableTNetherrack = config.get("Difficulty Changes", "Enable mod netherrack tools", true) + .getBoolean(true); + enableTSlime = + config.get("Difficulty Changes", "Enable mod slime tools", true).getBoolean(true); + enableTPaper = + config.get("Difficulty Changes", "Enable mod paper tools", true).getBoolean(true); + enableTBlueSlime = config.get("Difficulty Changes", "Enable mod blue slime tools", true) + .getBoolean(true); + + craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false) + .getBoolean(false); + vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true) + .getBoolean(true); + lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true) + .getBoolean(true); + removeGoldCastRecipes = config.get("Difficulty Changes", "Remove Gold Cast Recipes", true) + .getBoolean(true); + removeVanillaToolRecipes = config.get("Difficulty Changes", "Remove Vanilla Tool Recipes", false) + .getBoolean(false); + labotimizeVanillaTools = config.get("Difficulty Changes", "Remove Vanilla Tool Effectiveness", false) + .getBoolean(false); + miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true) + .getBoolean(true); + denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false) + .getBoolean(false); + craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true) + .getBoolean(true); + alternativeBoltRecipe = config.get( + "Difficulty Changes", + "Add alternative recipe for bolt parts: arrowhead + toolrod in a crafting grid", + false) + .getBoolean(false); + + naturalSlimeSpawn = config.get("Mobs", "Blue Slime spawn chance", 1, "Set to 0 to disable") + .getInt(1); + + ingotsPerOre = config.get( + "Smeltery Output Modification", + "Ingots per ore", + 2, + "Number of ingots returned from smelting ores in the smeltery") + .getDouble(2); + ingotsBronzeAlloy = config.get( + "Smeltery Output Modification", + "Bronze ingot return", + 4, + "Number of ingots returned from smelting Bronze in the smeltery") + .getDouble(4); + ingotsAluminumBrassAlloy = config.get( + "Smeltery Output Modification", + "Aluminum Brass ingot return", + 4, + "Number of ingots returned from smelting Aluminum Brass in the smeltery") + .getDouble(4); + ingotsAlumiteAlloy = config.get( + "Smeltery Output Modification", + "Alumite ingot return", + 3, + "Number of ingots returned from smelting Alumite in the smeltery") + .getDouble(3); + ingotsManyullynAlloy = config.get( + "Smeltery Output Modification", + "Manyullyn ingot return", + 1, + "Number of ingots returned from smelting Manyullyn in the smeltery") + .getDouble(1); + ingotsPigironAlloy = config.get( + "Smeltery Output Modification", + "Pig Iron ingot return", + 1, + "Number of ingots returned from smelting Pig Iron in the smeltery") + .getDouble(1); capesEnabled = config.get("Superfun", "Enable-TCon-Capes", true).getBoolean(true); - achievementsEnabled = config.get("Achievements", "Enable Achievements", true).getBoolean(true); + achievementsEnabled = + config.get("Achievements", "Enable Achievements", true).getBoolean(true); boolean ic2 = true; boolean xycraft = true; try { Class c = Class.forName("ic2.core.IC2"); ic2 = false; + } catch (Exception ignored) { } - catch (Exception ignored) {} - + try { Class c = Class.forName("soaryn.xycraft.core.XyCraft"); xycraft = false; + } catch (Exception ignored) { } - catch (Exception ignored) {} generateCopper = config.get("Worldgen Disabler", "Generate Copper", ic2).getBoolean(ic2); generateTin = config.get("Worldgen Disabler", "Generate Tin", ic2).getBoolean(ic2); - generateAluminum = config.get("Worldgen Disabler", "Generate Aluminum", xycraft).getBoolean(xycraft); - if(config.hasKey("worldgen disabler", "Generate Cobalt and Ardite")) { - generateNetherOres = config.get("Worldgen Disabler", "Generate Cobalt and Ardite", true).getBoolean(true); + generateAluminum = + config.get("Worldgen Disabler", "Generate Aluminum", xycraft).getBoolean(xycraft); + if (config.hasKey("worldgen disabler", "Generate Cobalt and Ardite")) { + generateNetherOres = config.get("Worldgen Disabler", "Generate Cobalt and Ardite", true) + .getBoolean(true); generateCobalt = generateArdite = generateNetherOres; ConfigCategory cat = config.getCategory("worldgen disabler"); cat.remove("Generate Cobalt and Ardite"); - } - else { - generateCobalt = config.get("Worldgen Disabler", "Generate Cobalt", true).getBoolean(true); - generateArdite = config.get("Worldgen Disabler", "Generate Ardite", true).getBoolean(true); + } else { + generateCobalt = + config.get("Worldgen Disabler", "Generate Cobalt", true).getBoolean(true); + generateArdite = + config.get("Worldgen Disabler", "Generate Ardite", true).getBoolean(true); } - generateIronSurface = config.get("Worldgen Disabler", "Generate Surface Iron", true).getBoolean(true); - generateGoldSurface = config.get("Worldgen Disabler", "Generate Surface Gold", true).getBoolean(true); - generateCopperSurface = config.get("Worldgen Disabler", "Generate Surface Copper", true).getBoolean(true); - generateTinSurface = config.get("Worldgen Disabler", "Generate Surface Tin", true).getBoolean(true); - generateAluminumSurface = config.get("Worldgen Disabler", "Generate Surface Aluminum", true).getBoolean(true); - - generateIronBush = config.get("Worldgen Disabler", "Generate Iron Bushes", true).getBoolean(true); - generateGoldBush = config.get("Worldgen Disabler", "Generate Gold Bushes", true).getBoolean(true); - generateCopperBush = config.get("Worldgen Disabler", "Generate Copper Bushes", true).getBoolean(true); - generateTinBush = config.get("Worldgen Disabler", "Generate Tin Bushes", true).getBoolean(true); - generateAluminumBush = config.get("Worldgen Disabler", "Generate Aluminum Bushes", true).getBoolean(true); - generateEssenceBush = config.get("Worldgen Disabler", "Generate Essence Bushes", true).getBoolean(true); - addToVillages = config.get("Worldgen Disabler", "Add Village Generation", true).getBoolean(true); - allowVillagerTrading = config.get("Worldgen Disabler", "Enable the Tinkers Villager to trade for oreberries", true).getBoolean(true); - - copperuDensity = config.get("Worldgen", "Copper Underground Density", 2, "Density: Chances per chunk").getInt(2); + generateIronSurface = + config.get("Worldgen Disabler", "Generate Surface Iron", true).getBoolean(true); + generateGoldSurface = + config.get("Worldgen Disabler", "Generate Surface Gold", true).getBoolean(true); + generateCopperSurface = + config.get("Worldgen Disabler", "Generate Surface Copper", true).getBoolean(true); + generateTinSurface = + config.get("Worldgen Disabler", "Generate Surface Tin", true).getBoolean(true); + generateAluminumSurface = config.get("Worldgen Disabler", "Generate Surface Aluminum", true) + .getBoolean(true); + + generateIronBush = + config.get("Worldgen Disabler", "Generate Iron Bushes", true).getBoolean(true); + generateGoldBush = + config.get("Worldgen Disabler", "Generate Gold Bushes", true).getBoolean(true); + generateCopperBush = + config.get("Worldgen Disabler", "Generate Copper Bushes", true).getBoolean(true); + generateTinBush = + config.get("Worldgen Disabler", "Generate Tin Bushes", true).getBoolean(true); + generateAluminumBush = config.get("Worldgen Disabler", "Generate Aluminum Bushes", true) + .getBoolean(true); + generateEssenceBush = + config.get("Worldgen Disabler", "Generate Essence Bushes", true).getBoolean(true); + addToVillages = + config.get("Worldgen Disabler", "Add Village Generation", true).getBoolean(true); + allowVillagerTrading = config.get( + "Worldgen Disabler", "Enable the Tinkers Villager to trade for oreberries", true) + .getBoolean(true); + + copperuDensity = config.get("Worldgen", "Copper Underground Density", 2, "Density: Chances per chunk") + .getInt(2); tinuDensity = config.get("Worldgen", "Tin Underground Density", 2).getInt(2); - aluminumuDensity = config.get("Worldgen", "Aluminum Underground Density", 3).getInt(3); - if(config.hasKey("worldgen", "Nether Ores Density")) { + aluminumuDensity = + config.get("Worldgen", "Aluminum Underground Density", 3).getInt(3); + if (config.hasKey("worldgen", "Nether Ores Density")) { netherDensity = config.get("Worldgen", "Nether Ores Density", 8).getInt(8); cobaltDensity = arditeDensity = netherDensity; ConfigCategory cat = config.getCategory("worldgen"); cat.remove("Nether Ores Density"); - } - else { + } else { cobaltDensity = config.get("worldgen", "Cobalt Ore Density", 8).getInt(8); arditeDensity = config.get("worldgen", "Ardite Ore Density", 8).getInt(8); } @@ -152,7 +220,8 @@ public static void initProps (File location) ironsRarity = config.get("Worldgen", "Iron Surface Rarity", 400).getInt(400); goldsRarity = config.get("Worldgen", "Gold Surface Rarity", 900).getInt(900); - coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 100, "Rarity: 1/num to generate in chunk").getInt(100); + coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 100, "Rarity: 1/num to generate in chunk") + .getInt(100); tinsRarity = config.get("Worldgen", "Tin Surface Rarity", 100).getInt(100); aluminumsRarity = config.get("Worldgen", "Aluminum Surface Rarity", 50).getInt(50); cobaltsRarity = config.get("Worldgen", "Cobalt Surface Rarity", 2000).getInt(2000); @@ -179,16 +248,38 @@ public static void initProps (File location) aluminumBushMaxY = config.get("Worldgen", "Aluminum Bush Max Y", 60).getInt(60); seaLevel = config.get("general", "Sea level", 64).getInt(64); - tconComesFirst = config.get("general", "Always cast TConstruct ingots", true, "You will always get a TConstruct item from casting an ingot or block.").getBoolean(); - - enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true).getBoolean(true); - goldAppleRecipe = config.get("Ultra Hardcore Changes", "Change Crafting Recipes", false, "Makes recipes for gold apples, carrots, and melon potions more expensive").getBoolean(false); - dropPlayerHeads = config.get("Ultra Hardcore Changes", "Players drop heads on death", false).getBoolean(false); - uhcGhastDrops = config.get("Ultra Hardcore Changes", "Change Ghast drops to Gold Ingots", false).getBoolean(false); - worldBorder = config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); - worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000).getInt(1000); - freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false, "Gives all tier 1 patterns when pattern chest is placed").getBoolean(false); - AbilityHelper.necroticUHS = config.get("Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false).getBoolean(false); + tconComesFirst = config.get( + "general", + "Always cast TConstruct ingots", + true, + "You will always get a TConstruct item from casting an ingot or block.") + .getBoolean(); + + enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true) + .getBoolean(true); + goldAppleRecipe = config.get( + "Ultra Hardcore Changes", + "Change Crafting Recipes", + false, + "Makes recipes for gold apples, carrots, and melon potions more expensive") + .getBoolean(false); + dropPlayerHeads = config.get("Ultra Hardcore Changes", "Players drop heads on death", false) + .getBoolean(false); + uhcGhastDrops = config.get("Ultra Hardcore Changes", "Change Ghast drops to Gold Ingots", false) + .getBoolean(false); + worldBorder = + config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); + worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000) + .getInt(1000); + freePatterns = config.get( + "Ultra Hardcore Changes", + "Add Patterns to Pattern Chests", + false, + "Gives all tier 1 patterns when pattern chest is placed") + .getBoolean(false); + AbilityHelper.necroticUHS = config.get( + "Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false) + .getBoolean(false); // Slime pools islandRarity = config.get("Worldgen", "Slime Island Rarity", 1450).getInt(1450); @@ -199,40 +290,75 @@ public static void initProps (File location) connectedTexturesMode = conTexMode.getInt(2); // dimension blacklist - cfgForbiddenDim = config.get("DimBlackList", "ForbiddenDim", new int[] {}, "Disallow Traveller's Belt ability to swap inventories for certain dimension ID's").getIntList(); - cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}, "Add dimension ID's to prevent slime islands from generating in them").getIntList(); - slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false, "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages").getBoolean(false); - slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true, "True: slime islands generate in overworld; False they do not generate").getBoolean(true); - genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false, "Generate slime islands in flat worlds").getBoolean(false); - genOresFlat = config.get("DimBlacklist", "genOresFlat", false, "Generate ores in flat worlds").getBoolean(false); + cfgForbiddenDim = config.get( + "DimBlackList", + "ForbiddenDim", + new int[] {}, + "Disallow Traveller's Belt ability to swap inventories for certain dimension ID's") + .getIntList(); + cfgDimBlackList = config.get( + "DimBlackList", + "SlimeIslandDimBlacklist", + new int[] {}, + "Add dimension ID's to prevent slime islands from generating in them") + .getIntList(); + slimeIslGenDim0Only = config.get( + "DimBlackList", + "GenerateSlimeIslandInDim0Only", + false, + "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages") + .getBoolean(false); + slimeIslGenDim0 = config.get( + "DimBlackList", + "slimeIslGenDim0", + true, + "True: slime islands generate in overworld; False they do not generate") + .getBoolean(true); + genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false, "Generate slime islands in flat worlds") + .getBoolean(false); + genOresFlat = config.get("DimBlacklist", "genOresFlat", false, "Generate ores in flat worlds") + .getBoolean(false); // Experimental functionality - throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); - meltableHorses = config.get("Experimental", "Allow horses to be melted down for glue", true).getBoolean(true); - meltableVillagers = config.get("Experimental", "Allow villagers to be melted down for emeralds", true).getBoolean(true); + throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true) + .getBoolean(true); + meltableHorses = config.get("Experimental", "Allow horses to be melted down for glue", true) + .getBoolean(true); + meltableVillagers = config.get("Experimental", "Allow villagers to be melted down for emeralds", true) + .getBoolean(true); minimalTextures = config.get("Experimental", "Minimal Textures", false).getBoolean(false); - extraBlockUpdates = config.get("Experimental", "Send additional block updates when using AOE tools", true,"This fixes very fast tools sometimes resulting in ghost blocks, but causes a bit more network traffic. Should be fine in theory.").getBoolean(true); - heartDropBlacklist = config.get("Experimental", "YellowHeartDropBlacklist", new String[] {"entitynpc", "entitycustomnpc"}, "Entity classes listed here will not drop yellow hearts. The values are the actual class names in lowercase.").getStringList(); + extraBlockUpdates = config.get( + "Experimental", + "Send additional block updates when using AOE tools", + true, + "This fixes very fast tools sometimes resulting in ghost blocks, but causes a bit more network traffic. Should be fine in theory.") + .getBoolean(true); + heartDropBlacklist = config.get( + "Experimental", + "YellowHeartDropBlacklist", + new String[] {"entitynpc", "entitycustomnpc"}, + "Entity classes listed here will not drop yellow hearts. The values are the actual class names in lowercase.") + .getStringList(); craftingStationBlacklist = Sets.newHashSet(config.get("CraftingStationBlacklist", "tileEntities", new String[] { - "wanion.avaritiaddons.block.chest.infinity.TileEntityInfinityChest" - }).getStringList()); - + "wanion.avaritiaddons.block.chest.infinity.TileEntityInfinityChest" + }) + .getStringList()); + /* Save the configuration file only if it has changed */ - if (config.hasChanged()) - config.save(); + if (config.hasChanged()) config.save(); File gt = new File(location + "/GregTech"); - if (gt.exists()) - { + if (gt.exists()) { File gtDyn = new File(location + "/GregTech/DynamicConfig.cfg"); Configuration gtConfig = new Configuration(gtDyn); gtConfig.load(); - gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false).getBoolean(false); + gregtech = gtConfig.get("smelting", "tile.anvil.slightlyDamaged", false) + .getBoolean(false); } } - //Modules + // Modules public static boolean worldModule; public static boolean toolModule; public static boolean smelteryModule; @@ -250,8 +376,10 @@ public static void initProps (File location) public static boolean generateCopper; public static boolean generateTin; public static boolean generateAluminum; + @Deprecated public static boolean generateNetherOres; + public static boolean generateArdite; public static boolean generateCobalt; @@ -275,8 +403,10 @@ public static void initProps (File location) public static int copperuDensity; public static int tinuDensity; public static int aluminumuDensity; + @Deprecated public static int netherDensity; + public static int cobaltDensity; public static int arditeDensity; diff --git a/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java index f2324895748..9e9b8654526 100644 --- a/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java +++ b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java @@ -10,58 +10,63 @@ import tconstruct.armor.TinkerArmor; import tconstruct.armor.player.TPlayerStats; -public class AccessoryInventoryPacket extends AbstractPacket -{ +public class AccessoryInventoryPacket extends AbstractPacket { int type; - public AccessoryInventoryPacket() - { + public AccessoryInventoryPacket() {} - } - - public AccessoryInventoryPacket(int type) - { + public AccessoryInventoryPacket(int type) { this.type = type; } @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeInt(type); } @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { type = buffer.readInt(); } @Override - public void handleClientSide (EntityPlayer player) - { - - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { - switch (type) - { - case ArmorProxyCommon.inventoryGui: - player.openGui(TConstruct.instance, ArmorProxyCommon.inventoryGui, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); - break; - case ArmorProxyCommon.armorGuiID: - player.openGui(TConstruct.instance, ArmorProxyCommon.armorGuiID, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); - break; - case ArmorProxyCommon.knapsackGuiID: - TPlayerStats stats = TPlayerStats.get(player); - ItemStack itemStack = stats.armor.getStackInSlot(2); - if (itemStack != null && itemStack.getItem() == TinkerArmor.knapsack && itemStack.stackSize > 0) - { - player.openGui(TConstruct.instance, ArmorProxyCommon.knapsackGuiID, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); - } - break; + public void handleServerSide(EntityPlayer player) { + switch (type) { + case ArmorProxyCommon.inventoryGui: + player.openGui( + TConstruct.instance, + ArmorProxyCommon.inventoryGui, + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ); + break; + case ArmorProxyCommon.armorGuiID: + player.openGui( + TConstruct.instance, + ArmorProxyCommon.armorGuiID, + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ); + break; + case ArmorProxyCommon.knapsackGuiID: + TPlayerStats stats = TPlayerStats.get(player); + ItemStack itemStack = stats.armor.getStackInSlot(2); + if (itemStack != null && itemStack.getItem() == TinkerArmor.knapsack && itemStack.stackSize > 0) { + player.openGui( + TConstruct.instance, + ArmorProxyCommon.knapsackGuiID, + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ); + } + break; } } } diff --git a/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java b/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java index 669da3d9c9b..af305163063 100644 --- a/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java +++ b/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java @@ -1,61 +1,50 @@ package tconstruct.util.network; -import tconstruct.TConstruct; -import tconstruct.armor.TinkerArmor; -import tconstruct.armor.player.TPlayerStats; import cpw.mods.fml.common.network.ByteBufUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import tconstruct.armor.TinkerArmor; +import tconstruct.armor.player.TPlayerStats; + /** * This Packet is for sending the players TPlayerStats from the server to the client. - * + * * @author covers1624 */ - -public class ArmourGuiSyncPacket extends AbstractPacket -{ +public class ArmourGuiSyncPacket extends AbstractPacket { NBTTagCompound playerStats = new NBTTagCompound(); - - public ArmourGuiSyncPacket() - { - } + + public ArmourGuiSyncPacket() {} /** * For sending the players TPlayerStats to the client. * @param tag, The players TPlayerStats written to NBT. */ - public ArmourGuiSyncPacket(NBTTagCompound tag) - { + public ArmourGuiSyncPacket(NBTTagCompound tag) { playerStats = tag; } - + @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { ByteBufUtils.writeTag(buffer, playerStats); } - + @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { playerStats = ByteBufUtils.readTag(buffer); } - + @Override - public void handleClientSide (EntityPlayer player) - { + public void handleClientSide(EntityPlayer player) { TPlayerStats stats = new TPlayerStats(player); stats.loadNBTData(playerStats); TinkerArmor.proxy.updatePlayerStats(stats); - } - + @Override - public void handleServerSide (EntityPlayer player) - { - //NO-OP. this is a Server -> client packet. + public void handleServerSide(EntityPlayer player) { + // NO-OP. this is a Server -> client packet. } - } diff --git a/src/main/java/tconstruct/util/network/BeltPacket.java b/src/main/java/tconstruct/util/network/BeltPacket.java index d6ee0da0a59..a69b8197219 100644 --- a/src/main/java/tconstruct/util/network/BeltPacket.java +++ b/src/main/java/tconstruct/util/network/BeltPacket.java @@ -7,32 +7,20 @@ import tconstruct.armor.PlayerAbilityHelper; import tconstruct.armor.player.TPlayerStats; -public class BeltPacket extends AbstractPacket -{ - public BeltPacket() - { - } +public class BeltPacket extends AbstractPacket { + public BeltPacket() {} @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { - } + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {} @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { - } + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {} @Override - public void handleClientSide (EntityPlayer player) - { - - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { + public void handleServerSide(EntityPlayer player) { PlayerAbilityHelper.swapBelt(player, TPlayerStats.get(player).armor); } - } diff --git a/src/main/java/tconstruct/util/network/DoubleJumpPacket.java b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java index c0dd277d368..3484a467bb2 100644 --- a/src/main/java/tconstruct/util/network/DoubleJumpPacket.java +++ b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java @@ -5,33 +5,21 @@ import mantle.common.network.AbstractPacket; import net.minecraft.entity.player.EntityPlayer; -public class DoubleJumpPacket extends AbstractPacket -{ +public class DoubleJumpPacket extends AbstractPacket { @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { - - } + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {} @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { - - } + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {} @Override - public void handleClientSide (EntityPlayer player) - { - - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { + public void handleServerSide(EntityPlayer player) { // String user = inputStream.readUTF(); // EntityPlayer player = TConstruct.playerTracker.getEntityPlayer(user); player.fallDistance = 0; } - } diff --git a/src/main/java/tconstruct/util/network/GogglePacket.java b/src/main/java/tconstruct/util/network/GogglePacket.java index 45925faf7a2..743aadd488d 100644 --- a/src/main/java/tconstruct/util/network/GogglePacket.java +++ b/src/main/java/tconstruct/util/network/GogglePacket.java @@ -6,43 +6,32 @@ import net.minecraft.entity.player.EntityPlayer; import tconstruct.armor.PlayerAbilityHelper; -public class GogglePacket extends AbstractPacket -{ +public class GogglePacket extends AbstractPacket { boolean active; - public GogglePacket() - { - } + public GogglePacket() {} - public GogglePacket(boolean active) - { + public GogglePacket(boolean active) { this.active = active; } @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeBoolean(active); } @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { active = buffer.readBoolean(); } @Override - public void handleClientSide (EntityPlayer player) - { - - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { + public void handleServerSide(EntityPlayer player) { PlayerAbilityHelper.toggleGoggles(player, active); /*TPlayerStats stats = TPlayerStats.get(player); stats.activeGoggles = active;*/ } - } diff --git a/src/main/java/tconstruct/util/network/HealthUpdatePacket.java b/src/main/java/tconstruct/util/network/HealthUpdatePacket.java index 343f15c827d..4dcd21804b7 100644 --- a/src/main/java/tconstruct/util/network/HealthUpdatePacket.java +++ b/src/main/java/tconstruct/util/network/HealthUpdatePacket.java @@ -1,20 +1,16 @@ package tconstruct.util.network; -import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.player.TPlayerStats; public class HealthUpdatePacket extends AbstractPacket { private float health; - public HealthUpdatePacket() { - } + public HealthUpdatePacket() {} public HealthUpdatePacket(float health) { this.health = health; @@ -38,7 +34,5 @@ public void handleClientSide(EntityPlayer player) { } @Override - public void handleServerSide(EntityPlayer player) { - - } + public void handleServerSide(EntityPlayer player) {} } diff --git a/src/main/java/tconstruct/util/network/MovementUpdatePacket.java b/src/main/java/tconstruct/util/network/MovementUpdatePacket.java index 5e11a46ebb0..404cb13e76b 100644 --- a/src/main/java/tconstruct/util/network/MovementUpdatePacket.java +++ b/src/main/java/tconstruct/util/network/MovementUpdatePacket.java @@ -4,7 +4,6 @@ import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; public class MovementUpdatePacket extends AbstractPacket { @@ -15,8 +14,7 @@ public class MovementUpdatePacket extends AbstractPacket { public float yaw; public float pitch; - public MovementUpdatePacket() { - } + public MovementUpdatePacket() {} public MovementUpdatePacket(Entity entity) { this.entityID = entity.getEntityId(); @@ -50,7 +48,7 @@ public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { @Override public void handleClientSide(EntityPlayer player) { Entity entity = player.worldObj.getEntityByID(entityID); - if(entity != null) { + if (entity != null) { entity.motionX = x; entity.motionY = y; entity.motionZ = z; diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index 551213bec6a..bf94e09a429 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -16,12 +16,11 @@ /** * Packet pipeline class. Directs all registered packet data to be handled by * the packets themselves. - * + * * @author sirgingalot some code from: cpw */ @ChannelHandler.Sharable -public class PacketPipeline extends MessageToMessageCodec -{ +public class PacketPipeline extends MessageToMessageCodec { private EnumMap channels; private LinkedList> packets = new LinkedList>(); @@ -30,30 +29,26 @@ public class PacketPipeline extends MessageToMessageCodec clazz) - { - if (this.packets.size() > 256) - { + public boolean registerPacket(Class clazz) { + if (this.packets.size() > 256) { // You should log here!! return false; } - if (this.packets.contains(clazz)) - { + if (this.packets.contains(clazz)) { // You should log here!! return false; } - if (this.isPostInitialised) - { + if (this.isPostInitialised) { // You should log here!! return false; } @@ -64,31 +59,29 @@ public boolean registerPacket (Class clazz) // In line encoding of the packet, including discriminator setting @Override - protected void encode (ChannelHandlerContext ctx, AbstractPacket msg, List out) throws Exception - { + protected void encode(ChannelHandlerContext ctx, AbstractPacket msg, List out) throws Exception { ByteBuf buffer = Unpooled.buffer(); Class clazz = msg.getClass(); - if (!this.packets.contains(msg.getClass())) - { - throw new NullPointerException("No Packet Registered for: " + msg.getClass().getCanonicalName()); + if (!this.packets.contains(msg.getClass())) { + throw new NullPointerException( + "No Packet Registered for: " + msg.getClass().getCanonicalName()); } byte discriminator = (byte) this.packets.indexOf(clazz); buffer.writeByte(discriminator); msg.encodeInto(ctx, buffer); - FMLProxyPacket proxyPacket = new FMLProxyPacket(buffer.copy(), ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); + FMLProxyPacket proxyPacket = new FMLProxyPacket( + buffer.copy(), ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()); out.add(proxyPacket); } // In line decoding and handling of the packet @Override - protected void decode (ChannelHandlerContext ctx, FMLProxyPacket msg, List out) throws Exception - { + protected void decode(ChannelHandlerContext ctx, FMLProxyPacket msg, List out) throws Exception { ByteBuf payload = msg.payload(); byte discriminator = payload.readByte(); Class clazz = this.packets.get(discriminator); - if (clazz == null) - { + if (clazz == null) { throw new NullPointerException("No packet registered for discriminator: " + discriminator); } @@ -96,32 +89,30 @@ protected void decode (ChannelHandlerContext ctx, FMLProxyPacket msg, List>() - { + Collections.sort(this.packets, new Comparator>() { @Override - public int compare (Class clazz1, Class clazz2) - { + public int compare(Class clazz1, Class clazz2) { int com = String.CASE_INSENSITIVE_ORDER.compare(clazz1.getCanonicalName(), clazz2.getCanonicalName()); - if (com == 0) - { + if (com == 0) { com = clazz1.getCanonicalName().compareTo(clazz2.getCanonicalName()); } @@ -168,8 +154,7 @@ public int compare (Class clazz1, Class * Adapted from CPW's code in * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * + * * @param message * The message to send */ - public void sendToAll (AbstractPacket message) - { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL); + public void sendToAll(AbstractPacket message) { + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.ALL); this.channels.get(Side.SERVER).writeAndFlush(message); } @@ -193,16 +180,21 @@ public void sendToAll (AbstractPacket message) *

* Adapted from CPW's code in * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * + * * @param message * The message to send * @param player * The player to send it to */ - public void sendTo (AbstractPacket message, EntityPlayerMP player) - { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); + public void sendTo(AbstractPacket message, EntityPlayerMP player) { + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(player); this.channels.get(Side.SERVER).writeAndFlush(message); } @@ -211,7 +203,7 @@ public void sendTo (AbstractPacket message, EntityPlayerMP player) *

* Adapted from CPW's code in * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * + * * @param message * The message to send * @param point @@ -219,10 +211,15 @@ public void sendTo (AbstractPacket message, EntityPlayerMP player) * {@link cpw.mods.fml.common.network.NetworkRegistry.TargetPoint} * around which to send */ - public void sendToAllAround (AbstractPacket message, NetworkRegistry.TargetPoint point) - { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point); + public void sendToAllAround(AbstractPacket message, NetworkRegistry.TargetPoint point) { + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(point); this.channels.get(Side.SERVER).writeAndFlush(message); } @@ -231,16 +228,21 @@ public void sendToAllAround (AbstractPacket message, NetworkRegistry.TargetPoint *

* Adapted from CPW's code in * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * + * * @param message * The message to send * @param dimensionId * The dimension id to target */ - public void sendToDimension (AbstractPacket message, int dimensionId) - { - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.DIMENSION); - this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(dimensionId); + public void sendToDimension(AbstractPacket message, int dimensionId) { + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.DIMENSION); + this.channels + .get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(dimensionId); this.channels.get(Side.SERVER).writeAndFlush(message); } @@ -249,13 +251,15 @@ public void sendToDimension (AbstractPacket message, int dimensionId) *

* Adapted from CPW's code in * cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper - * + * * @param message * The message to send */ - public void sendToServer (AbstractPacket message) - { - this.channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER); + public void sendToServer(AbstractPacket message) { + this.channels + .get(Side.CLIENT) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.TOSERVER); this.channels.get(Side.CLIENT).writeAndFlush(message); } } diff --git a/src/main/java/tconstruct/util/network/PatternTablePacket.java b/src/main/java/tconstruct/util/network/PatternTablePacket.java index 715eddcd75c..6b72248de8b 100644 --- a/src/main/java/tconstruct/util/network/PatternTablePacket.java +++ b/src/main/java/tconstruct/util/network/PatternTablePacket.java @@ -11,19 +11,14 @@ import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; -public class PatternTablePacket extends AbstractPacket -{ +public class PatternTablePacket extends AbstractPacket { int x, y, z; ItemStack contents; - public PatternTablePacket() - { + public PatternTablePacket() {} - } - - public PatternTablePacket(int x, int y, int z, ItemStack contents) - { + public PatternTablePacket(int x, int y, int z, ItemStack contents) { this.x = x; this.y = y; this.z = z; @@ -31,8 +26,7 @@ public PatternTablePacket(int x, int y, int z, ItemStack contents) } @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeInt(x); buffer.writeInt(y); buffer.writeInt(z); @@ -40,8 +34,7 @@ public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) } @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); @@ -49,40 +42,30 @@ public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) } @Override - public void handleClientSide (EntityPlayer player) - { - - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { - if (player.openContainer instanceof PatternShaperContainer) - { + public void handleServerSide(EntityPlayer player) { + if (player.openContainer instanceof PatternShaperContainer) { PatternShaperContainer container = (PatternShaperContainer) player.openContainer; StencilTableLogic logic = container.logic; if (logic != null && logic.xCoord == this.x && logic.yCoord == this.y && logic.zCoord == this.z) - if (this.contents == null) - logic.setSelectedPattern(null); - else - { + if (this.contents == null) logic.setSelectedPattern(null); + else { ItemStack stackBlank = logic.getStackInSlot(0); - if (stackBlank != null && stackBlank.stackSize > 0 && StencilBuilder.isBlank(stackBlank)) - { + if (stackBlank != null && stackBlank.stackSize > 0 && StencilBuilder.isBlank(stackBlank)) { boolean warning = true; - for (ItemStack stack : StencilBuilder.instance.stencils.values()) - { - if (stack != null && this.contents.isItemEqual(stack)) - { + for (ItemStack stack : StencilBuilder.instance.stencils.values()) { + if (stack != null && this.contents.isItemEqual(stack)) { this.contents = stack.copy(); warning = false; break; } } if (warning) - TConstruct.logger.warn("Possible packet-cheating with PatternTable for player " + player.getCommandSenderName()); - else - logic.setSelectedPattern(this.contents); + TConstruct.logger.warn("Possible packet-cheating with PatternTable for player " + + player.getCommandSenderName()); + else logic.setSelectedPattern(this.contents); } } } diff --git a/src/main/java/tconstruct/util/network/SignDataPacket.java b/src/main/java/tconstruct/util/network/SignDataPacket.java index 329f3e23d12..9f9401d7c2f 100644 --- a/src/main/java/tconstruct/util/network/SignDataPacket.java +++ b/src/main/java/tconstruct/util/network/SignDataPacket.java @@ -9,17 +9,13 @@ import tconstruct.TConstruct; import tconstruct.tools.logic.BattlesignLogic; -public class SignDataPacket extends AbstractPacket -{ +public class SignDataPacket extends AbstractPacket { private int dimension, x, y, z, length; private String[] text; - public SignDataPacket() - { - } + public SignDataPacket() {} - public SignDataPacket(int dimension, int x, int y, int z, String[] text) - { + public SignDataPacket(int dimension, int x, int y, int z, String[] text) { this.text = text; this.dimension = dimension; this.x = x; @@ -29,41 +25,35 @@ public SignDataPacket(int dimension, int x, int y, int z, String[] text) } @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeInt(dimension); buffer.writeInt(x); buffer.writeInt(y); buffer.writeInt(z); buffer.writeInt(length); - for (int i = 0; i < length; i++) - { + for (int i = 0; i < length; i++) { ByteBufUtils.writeUTF8String(buffer, text[i]); } } @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { dimension = buffer.readInt(); x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); length = buffer.readInt(); text = new String[length]; - for (int i = 0; i < length; i++) - { + for (int i = 0; i < length; i++) { text[i] = ByteBufUtils.readUTF8String(buffer); } } @Override - public void handleClientSide (EntityPlayer player) - { + public void handleClientSide(EntityPlayer player) { TileEntity te = player.worldObj.getTileEntity(x, y, z); - if (te instanceof BattlesignLogic) - { + if (te instanceof BattlesignLogic) { BattlesignLogic logic = (BattlesignLogic) te; logic.setText(text); @@ -71,17 +61,14 @@ public void handleClientSide (EntityPlayer player) } @Override - public void handleServerSide (EntityPlayer player) - { - if (player.worldObj.blockExists(x, y, z)) - { + public void handleServerSide(EntityPlayer player) { + if (player.worldObj.blockExists(x, y, z)) { return; } TileEntity te = player.worldObj.getTileEntity(x, y, z); - if (te instanceof BattlesignLogic) - { + if (te instanceof BattlesignLogic) { BattlesignLogic logic = (BattlesignLogic) te; logic.setText(text); diff --git a/src/main/java/tconstruct/util/network/SmelteryPacket.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java index 40132898e61..42d39cec009 100644 --- a/src/main/java/tconstruct/util/network/SmelteryPacket.java +++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java @@ -11,19 +11,14 @@ import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.smeltery.logic.SmelteryLogic; -public class SmelteryPacket extends AbstractPacket -{ +public class SmelteryPacket extends AbstractPacket { int dimension, x, y, z, fluidID; boolean isShiftPressed; - public SmelteryPacket() - { + public SmelteryPacket() {} - } - - public SmelteryPacket(int dimension, int x, int y, int z, boolean isShiftPressed, int fluidID) - { + public SmelteryPacket(int dimension, int x, int y, int z, boolean isShiftPressed, int fluidID) { this.dimension = dimension; this.x = x; this.y = y; @@ -33,20 +28,17 @@ public SmelteryPacket(int dimension, int x, int y, int z, boolean isShiftPressed } @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeInt(dimension); buffer.writeInt(x); buffer.writeInt(y); buffer.writeInt(z); buffer.writeBoolean(isShiftPressed); buffer.writeInt(fluidID); - } @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { dimension = buffer.readInt(); x = buffer.readInt(); y = buffer.readInt(); @@ -56,41 +48,36 @@ public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) } @Override - public void handleClientSide (EntityPlayer player) - { - - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { - if (player.openContainer instanceof SmelteryContainer) - { + public void handleServerSide(EntityPlayer player) { + if (player.openContainer instanceof SmelteryContainer) { SmelteryContainer container = (SmelteryContainer) player.openContainer; SmelteryLogic logic = container.logic; - if (logic != null && logic.hasWorldObj() && logic.getWorldObj().provider.dimensionId == this.dimension && logic.xCoord == this.x && logic.yCoord == this.y && logic.zCoord == this.z) - { + if (logic != null + && logic.hasWorldObj() + && logic.getWorldObj().provider.dimensionId == this.dimension + && logic.xCoord == this.x + && logic.yCoord == this.y + && logic.zCoord == this.z) { FluidStack temp = null; - for (FluidStack liquid : logic.moltenMetal) - { - if (liquid.getFluidID() == this.fluidID) - temp = liquid; + for (FluidStack liquid : logic.moltenMetal) { + if (liquid.getFluidID() == this.fluidID) temp = liquid; } - if (temp != null) - { + if (temp != null) { logic.moltenMetal.remove(temp); - if (this.isShiftPressed) - logic.moltenMetal.add(temp); - else - logic.moltenMetal.add(0, temp); + if (this.isShiftPressed) logic.moltenMetal.add(temp); + else logic.moltenMetal.add(0, temp); } NBTTagCompound data = new NBTTagCompound(); logic.writeToNBT(data); - TConstruct.packetPipeline.sendToDimension(new PacketUpdateTE(this.x, this.y, this.z, data), this.dimension); + TConstruct.packetPipeline.sendToDimension( + new PacketUpdateTE(this.x, this.y, this.z, data), this.dimension); } } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/util/network/ToolStationPacket.java b/src/main/java/tconstruct/util/network/ToolStationPacket.java index f27a1e71ec7..17d747f689c 100644 --- a/src/main/java/tconstruct/util/network/ToolStationPacket.java +++ b/src/main/java/tconstruct/util/network/ToolStationPacket.java @@ -8,18 +8,14 @@ import tconstruct.tools.inventory.ToolStationContainer; import tconstruct.tools.logic.ToolStationLogic; -public class ToolStationPacket extends AbstractPacket -{ +public class ToolStationPacket extends AbstractPacket { private int x, y, z; private String toolName; - public ToolStationPacket() - { - } + public ToolStationPacket() {} - public ToolStationPacket(int x, int y, int z, String toolName) - { + public ToolStationPacket(int x, int y, int z, String toolName) { this.x = x; this.y = y; this.z = z; @@ -27,8 +23,7 @@ public ToolStationPacket(int x, int y, int z, String toolName) } @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { buffer.writeInt(x); buffer.writeInt(y); buffer.writeInt(z); @@ -36,8 +31,7 @@ public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) } @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { x = buffer.readInt(); y = buffer.readInt(); z = buffer.readInt(); @@ -45,22 +39,16 @@ public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) } @Override - public void handleClientSide (EntityPlayer player) - { - } + public void handleClientSide(EntityPlayer player) {} @Override - public void handleServerSide (EntityPlayer player) - { - if (player.openContainer instanceof ToolStationContainer) - { + public void handleServerSide(EntityPlayer player) { + if (player.openContainer instanceof ToolStationContainer) { ToolStationContainer container = (ToolStationContainer) player.openContainer; ToolStationLogic logic = container.logic; - if (logic != null && logic.xCoord == x && logic.yCoord == y && logic.zCoord == z) - { + if (logic != null && logic.xCoord == x && logic.yCoord == y && logic.zCoord == z) { logic.setToolname(toolName); } } } - } diff --git a/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java b/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java index 56107d3aa72..915166ab787 100644 --- a/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java +++ b/src/main/java/tconstruct/weaponry/AlternateBoltRecipe.java @@ -5,9 +5,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; -import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.DualMaterialToolPart; -import tconstruct.library.util.IPattern; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; import tconstruct.util.Reference; @@ -15,7 +13,8 @@ public class AlternateBoltRecipe implements IRecipe { static { // register the recipe with the recipesorter - RecipeSorter.register(Reference.MOD_ID + ":part", AlternateBoltRecipe.class, RecipeSorter.Category.SHAPELESS, ""); + RecipeSorter.register( + Reference.MOD_ID + ":part", AlternateBoltRecipe.class, RecipeSorter.Category.SHAPELESS, ""); } private ItemStack outputPart; @@ -26,40 +25,33 @@ public boolean matches(InventoryCrafting inventoryCrafting, World world) { ItemStack rod = null; ItemStack head = null; - for(int i = 0; i < inventoryCrafting.getSizeInventory(); i++) - { + for (int i = 0; i < inventoryCrafting.getSizeInventory(); i++) { ItemStack slot = inventoryCrafting.getStackInSlot(i); // empty slot - if(slot == null) - continue; + if (slot == null) continue; // is it the tool? - if(slot.getItem() == TinkerWeaponry.arrowhead) { + if (slot.getItem() == TinkerWeaponry.arrowhead) { // only one arrowhead - if(head != null) - return false; + if (head != null) return false; head = slot; - } - else if(slot.getItem() == TinkerTools.toolRod) { + } else if (slot.getItem() == TinkerTools.toolRod) { // only one rod - if(rod != null) - return false; + if (rod != null) return false; rod = slot; - } - else { + } else { // unknown object return false; } } - if(rod == null || head == null) - return false; + if (rod == null || head == null) return false; // craft the bolt - int mat1 = ((IToolPart)rod.getItem()).getMaterialID(rod); - int mat2 = ((IToolPart)head.getItem()).getMaterialID(head); + int mat1 = ((IToolPart) rod.getItem()).getMaterialID(rod); + int mat2 = ((IToolPart) head.getItem()).getMaterialID(head); outputPart = DualMaterialToolPart.createDualMaterial(TinkerWeaponry.partBolt, mat1, mat2); diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index b8c246d6f84..59c49c47719 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -1,5 +1,6 @@ package tconstruct.weaponry; +import static tconstruct.tools.TinkerTools.MaterialID; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.SidedProxy; @@ -7,6 +8,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import java.util.Map; +import java.util.Random; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import net.minecraft.block.BlockDispenser; @@ -15,25 +18,28 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.*; import tconstruct.library.entity.ProjectileBase; +import tconstruct.library.tools.DualMaterialToolPart; import tconstruct.library.tools.DynamicToolPart; import tconstruct.library.tools.FletchlingLeafMaterial; import tconstruct.library.util.BehaviorProjectileBaseDispense; import tconstruct.library.util.IPattern; import tconstruct.library.util.IToolPart; +import tconstruct.library.weaponry.AmmoItem; +import tconstruct.library.weaponry.AmmoWeapon; +import tconstruct.library.weaponry.ArrowShaftMaterial; +import tconstruct.library.weaponry.ProjectileWeapon; +import tconstruct.modifiers.tools.ModAmmoRestock; import tconstruct.modifiers.tools.ModAttack; import tconstruct.modifiers.tools.ModWindup; -import tconstruct.modifiers.tools.ModAmmoRestock; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.tools.items.Bowstring; @@ -42,28 +48,23 @@ import tconstruct.util.config.PHConstruct; import tconstruct.weaponry.ammo.ArrowAmmo; import tconstruct.weaponry.ammo.BoltAmmo; -import tconstruct.library.tools.DualMaterialToolPart; import tconstruct.weaponry.entity.*; import tconstruct.weaponry.items.Boneana; import tconstruct.weaponry.items.GlassArrows; import tconstruct.weaponry.items.WeaponryPattern; import tconstruct.weaponry.items.WeaponryPatternClay; -import tconstruct.library.weaponry.AmmoItem; -import tconstruct.library.weaponry.AmmoWeapon; -import tconstruct.library.weaponry.ArrowShaftMaterial; -import tconstruct.library.weaponry.ProjectileWeapon; import tconstruct.weaponry.weapons.*; import tconstruct.world.TinkerWorld; -import java.util.Map; -import java.util.Random; - -import static tconstruct.tools.TinkerTools.MaterialID; - @GameRegistry.ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers' Weaponry", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", pulsesRequired="Tinkers' Tools") +@Pulse( + id = "Tinkers' Weaponry", + description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", + pulsesRequired = "Tinkers' Tools") public class TinkerWeaponry { - @SidedProxy(clientSide = "tconstruct.weaponry.WeaponryClientProxy", serverSide = "tconstruct.weaponry.WeaponryCommonProxy") + @SidedProxy( + clientSide = "tconstruct.weaponry.WeaponryClientProxy", + serverSide = "tconstruct.weaponry.WeaponryCommonProxy") public static WeaponryCommonProxy proxy; // Throwing Weapons @@ -96,7 +97,6 @@ public class TinkerWeaponry { public static Pattern metalPattern; public static Pattern clayPattern; - // legendary weapons? public static GlassArrows glassArrows; public static Boneana boneana; @@ -105,20 +105,17 @@ public class TinkerWeaponry { public static ModAttack modAttack; public static Random random = new Random(); - public static Item[] patternOutputs; @Handler - public void preInit(FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { registerItems(); registerLegendaries(); registerMaterials(); } @Handler - public void init(FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { addPartRecipies(); addWeaponRecipies(); setupCreativeTab(); @@ -126,10 +123,16 @@ public void init(FMLInitializationEvent event) // Modifiers ItemStack redstoneItem = new ItemStack(Items.redstone); ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); - ModifyBuilder.registerModifier(new ModWindup(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); + ModifyBuilder.registerModifier( + new ModWindup(2, new ItemStack[] {redstoneItem, redstoneBlock}, new int[] {1, 9})); ModifyBuilder.registerModifier(new ModAmmoRestock()); - modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, true); + modAttack = new ModAttack( + "Quartz", + 11, + new ItemStack[] {new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)}, + new int[] {1, 4}, + true); ModifyBuilder.registerModifier(modAttack); TConstructRegistry.registerActiveToolMod(new WeaponryActiveToolMod()); @@ -138,35 +141,30 @@ public void init(FMLInitializationEvent event) } @Handler - public void postInit(FMLPostInitializationEvent event) - { + public void postInit(FMLPostInitializationEvent event) { // this handler takes care that ammo weapons get ammo. WeaponryHandler weaponryHandler = new WeaponryHandler(); MinecraftForge.EVENT_BUS.register(weaponryHandler); FMLCommonHandler.instance().bus().register(weaponryHandler); - // "vanilla" bolt: // iron-tipped wood-shaft with feather fletching - ItemStack headStack = DualMaterialToolPart.createDualMaterial(boltAmmo.getHeadItem(), TinkerTools.MaterialID.Wood, TinkerTools.MaterialID.Iron); + ItemStack headStack = DualMaterialToolPart.createDualMaterial( + boltAmmo.getHeadItem(), TinkerTools.MaterialID.Wood, TinkerTools.MaterialID.Iron); ItemStack handleStack = new ItemStack(boltAmmo.getAccessoryItem(), 1, 0); // feather fletchling ItemStack tool = ToolBuilder.instance.buildTool(headStack, handleStack, null, null, ""); - if (tool != null) - { + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); creativeBolt = tool; - } - else - TConstruct.logger.error("Couldn't build basic Tinker Bolt for creative crossbow shootnig"); + } else TConstruct.logger.error("Couldn't build basic Tinker Bolt for creative crossbow shootnig"); proxy.init(); registerBoltCasting(); } - private void registerItems() - { + private void registerItems() { // create tool part TinkerTools.bowstring = bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring"); TinkerTools.arrowhead = arrowhead = new DynamicToolPart("_arrowhead", "ArrowHead"); @@ -194,7 +192,6 @@ private void registerItems() metalPattern = new WeaponryPattern("cast_", "MetalPattern"); clayPattern = new WeaponryPatternClay("clay_cast_", "ClayPattern"); - // register tool parts GameRegistry.registerItem(bowstring, "bowstring"); // 1.8 todo: rename properly? GameRegistry.registerItem(arrowhead, "arrowhead"); @@ -219,11 +216,9 @@ private void registerItems() GameRegistry.registerItem(woodPattern, "Pattern"); GameRegistry.registerItem(metalPattern, "Cast"); GameRegistry.registerItem(clayPattern, "Clay Cast"); - } - private void addPartRecipies() - { + private void addPartRecipies() { StencilBuilder.registerStencil(21, TinkerTools.woodPattern, 25); // arrow head StencilBuilder.registerStencil(22, TinkerTools.woodPattern, 24); // fletchling StencilBuilder.registerStencil(23, TinkerTools.woodPattern, 23); // bowstring @@ -236,38 +231,47 @@ private void addPartRecipies() PatternBuilder.instance.addToolPattern(woodPattern); // todo: integrate into tcon - int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; - int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; - patternOutputs = new Item[] { partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb }; - + int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17}; + int[] liquidDamage = new int[] {2, 13, 10, 11, 12, 14, 15, 6, 16, 18}; + patternOutputs = new Item[] {partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb}; // register part crafting - if (PHConstruct.craftMetalTools) - { + if (PHConstruct.craftMetalTools) { for (int m = 0; m < patternOutputs.length; m++) for (int i = 0; i < 18; i++) TConstructRegistry.addPartMapping(woodPattern, m, i, new ItemStack(patternOutputs[m], 1, i)); - } - else { + } else { for (int m = 0; m < patternOutputs.length; m++) for (int nonMetal : nonMetals) - TConstructRegistry.addPartMapping(woodPattern, m, nonMetal, new ItemStack(patternOutputs[m], 1, nonMetal)); + TConstructRegistry.addPartMapping( + woodPattern, m, nonMetal, new ItemStack(patternOutputs[m], 1, nonMetal)); } // arrowhead is still integrated in tinkertools.. bla n stuff for (int nonMetal : nonMetals) - TConstructRegistry.addPartMapping(TinkerTools.woodPattern, 25, nonMetal, new ItemStack(arrowhead, 1, nonMetal)); + TConstructRegistry.addPartMapping( + TinkerTools.woodPattern, 25, nonMetal, new ItemStack(arrowhead, 1, nonMetal)); // register part casting - if(TConstruct.pulsar.isPulseLoaded("Tinkers' Smeltery")) { + if (TConstruct.pulsar.isPulseLoaded("Tinkers' Smeltery")) { LiquidCasting tableCasting = TConstructRegistry.getTableCasting(); for (int i = 0; i < patternOutputs.length; i++) { ItemStack cast = new ItemStack(metalPattern, 1, i); ItemStack clay_cast = new ItemStack(clayPattern, 1, i); - - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50); - if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50); + + tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), + false, + 50); + if (!PHConstruct.removeGoldCastRecipes) + tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), + false, + 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); @@ -281,14 +285,25 @@ private void addPartRecipies() ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, 25); ItemStack clay_cast = new ItemStack(TinkerSmeltery.clayPattern, 1, 25); - - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50); + + tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), + new ItemStack(arrowhead, 1, Short.MAX_VALUE), + false, + 50); if (!PHConstruct.removeGoldCastRecipes) - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe( + cast, + new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), + new ItemStack(arrowhead, 1, Short.MAX_VALUE), + false, + 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); - int fluidAmount = ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; + int fluidAmount = + ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; ItemStack metalCast = new ItemStack(arrowhead, 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50); @@ -297,11 +312,9 @@ private void addPartRecipies() // Stone parts FluidType stone = FluidType.getFluidType("Stone"); - for (int sc = 0; sc < patternOutputs.length; sc++) - { - if (patternOutputs[sc] != null) - { - ItemStack item = new ItemStack(patternOutputs[sc], 1, 1); + for (int sc = 0; sc < patternOutputs.length; sc++) { + if (patternOutputs[sc] != null) { + ItemStack item = new ItemStack(patternOutputs[sc], 1, 1); int amount = (8 * woodPattern.getPatternCost(new ItemStack(woodPattern, 1, sc))) / 2; Smeltery.addMelting(stone, item, 1, amount); } @@ -309,8 +322,7 @@ private void addPartRecipies() } } - private void registerLegendaries() - { + private void registerLegendaries() { glassArrows = new GlassArrows(); boneana = new Boneana(); @@ -318,125 +330,180 @@ private void registerLegendaries() GameRegistry.registerItem(boneana, "Boneana"); } - private void registerMaterials() - { + private void registerMaterials() { // Bow Materials: Material ID, durability, drawspeed, arrow speed // speed 3.0 == exactly the vanilla bow if 2 parts of speed 3 are used // Wooden stuff is flexible, therefore good. Reference. TConstructRegistry.addBowMaterial(MaterialID.Wood, 18, 3.0f); // Wood // other organic materials also are good - TConstructRegistry.addBowMaterial(MaterialID.Cactus, 20, 3.4f); // Cactus - TConstructRegistry.addBowMaterial(MaterialID.Bone, 38, 3.0f); // Bone - TConstructRegistry.addBowMaterial(MaterialID.Slime, 28, 4.2f); // Slime - TConstructRegistry.addBowMaterial(MaterialID.BlueSlime, 21, 4.0f); // Blue Slime - TConstructRegistry.addBowMaterial(MaterialID.Paper, 10, 1.1f); // Paper + TConstructRegistry.addBowMaterial(MaterialID.Cactus, 20, 3.4f); // Cactus + TConstructRegistry.addBowMaterial(MaterialID.Bone, 38, 3.0f); // Bone + TConstructRegistry.addBowMaterial(MaterialID.Slime, 28, 4.2f); // Slime + TConstructRegistry.addBowMaterial(MaterialID.BlueSlime, 21, 4.0f); // Blue Slime + TConstructRegistry.addBowMaterial(MaterialID.Paper, 10, 1.1f); // Paper // Metal stuff has a lot of POW, but takes LONG to wind up since it's so hard - TConstructRegistry.addBowMaterial(MaterialID.Iron, 54, 5.2f); // Iron - TConstructRegistry.addBowMaterial(MaterialID.Steel, 60, 5.5f); // Steel - TConstructRegistry.addBowMaterial(MaterialID.PigIron, 42, 5.2f); // Pig Iron - it's meat! - TConstructRegistry.addBowMaterial(MaterialID.Ardite, 55, 4.9f); // Ardite - TConstructRegistry.addBowMaterial(MaterialID.Cobalt, 45, 5.3f); // Cobalt - TConstructRegistry.addBowMaterial(MaterialID.Manyullyn, 50, 5.0f); // Manyullyn - TConstructRegistry.addBowMaterial(MaterialID.Copper, 40, 4.9f); // Copper - TConstructRegistry.addBowMaterial(MaterialID.Bronze, 45, 5.1f); // Bronze - TConstructRegistry.addBowMaterial(MaterialID.Alumite, 45, 5.0f); // Alumite - a bit stone-ish since it has obsidian + TConstructRegistry.addBowMaterial(MaterialID.Iron, 54, 5.2f); // Iron + TConstructRegistry.addBowMaterial(MaterialID.Steel, 60, 5.5f); // Steel + TConstructRegistry.addBowMaterial(MaterialID.PigIron, 42, 5.2f); // Pig Iron - it's meat! + TConstructRegistry.addBowMaterial(MaterialID.Ardite, 55, 4.9f); // Ardite + TConstructRegistry.addBowMaterial(MaterialID.Cobalt, 45, 5.3f); // Cobalt + TConstructRegistry.addBowMaterial(MaterialID.Manyullyn, 50, 5.0f); // Manyullyn + TConstructRegistry.addBowMaterial(MaterialID.Copper, 40, 4.9f); // Copper + TConstructRegistry.addBowMaterial(MaterialID.Bronze, 45, 5.1f); // Bronze + TConstructRegistry.addBowMaterial( + MaterialID.Alumite, 45, 5.0f); // Alumite - a bit stone-ish since it has obsidian // Stone doesn't bend. takes forever, has no pow. WHY WOULD YOU DO THAT - TConstructRegistry.addBowMaterial(MaterialID.Stone, 90, 1.0f); // Stone - TConstructRegistry.addBowMaterial(MaterialID.Flint, 90, 1.0f); // Flint - TConstructRegistry.addBowMaterial(MaterialID.Obsidian, 109, 1.0f); // Obsidian + TConstructRegistry.addBowMaterial(MaterialID.Stone, 90, 1.0f); // Stone + TConstructRegistry.addBowMaterial(MaterialID.Flint, 90, 1.0f); // Flint + TConstructRegistry.addBowMaterial(MaterialID.Obsidian, 109, 1.0f); // Obsidian TConstructRegistry.addBowMaterial(MaterialID.Netherrack, 80, 1.0f); // Netherrack // Arrow Head Materials: Material ID, mass, fragility - TConstructRegistry.addArrowMaterial(MaterialID.Wood, 0.69F, 0.5F); //Wood - TConstructRegistry.addArrowMaterial(MaterialID.Stone, 2.05F, 1.0F); //Stone - TConstructRegistry.addArrowMaterial(MaterialID.Iron, 3.3F, 0.8F); //Iron - TConstructRegistry.addArrowMaterial(MaterialID.Flint, 1.325F, 1.0F); //Flint - TConstructRegistry.addArrowMaterial(MaterialID.Cactus, 0.76F, 1.0F); //Cactus - TConstructRegistry.addArrowMaterial(MaterialID.Bone, 1.69F, 1.0F); //Bone - TConstructRegistry.addArrowMaterial(MaterialID.Obsidian, 2.4F, 1.0F); //Obsidian - TConstructRegistry.addArrowMaterial(MaterialID.Netherrack, 1.5F, 1.3F); //Netherrack - TConstructRegistry.addArrowMaterial(MaterialID.Slime, 0.22F, 0.0F); //Slime - TConstructRegistry.addArrowMaterial(MaterialID.Paper, 0.69F, 10.0F); //Paper - TConstructRegistry.addArrowMaterial(MaterialID.Cobalt, 3.0F, 2.0f); //Cobalt - TConstructRegistry.addArrowMaterial(MaterialID.Ardite, 1.25F, 2.0f); //Ardite - TConstructRegistry.addArrowMaterial(MaterialID.Manyullyn, 2.25F, 1.0F); //Manyullyn - TConstructRegistry.addArrowMaterial(MaterialID.Copper, 2.7F, 1.1F); //Copper - TConstructRegistry.addArrowMaterial(MaterialID.Bronze, 3.2F, 1.2f); //Bronze - TConstructRegistry.addArrowMaterial(MaterialID.Alumite, 1.1F, 0.7f); //Alumite - TConstructRegistry.addArrowMaterial(MaterialID.Steel, 3.6F, 0.9f); //Steel - TConstructRegistry.addArrowMaterial(MaterialID.BlueSlime, 0.22F, 0.0F); //Blue Slime - TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.0F, 0.5F); //Pigiron + TConstructRegistry.addArrowMaterial(MaterialID.Wood, 0.69F, 0.5F); // Wood + TConstructRegistry.addArrowMaterial(MaterialID.Stone, 2.05F, 1.0F); // Stone + TConstructRegistry.addArrowMaterial(MaterialID.Iron, 3.3F, 0.8F); // Iron + TConstructRegistry.addArrowMaterial(MaterialID.Flint, 1.325F, 1.0F); // Flint + TConstructRegistry.addArrowMaterial(MaterialID.Cactus, 0.76F, 1.0F); // Cactus + TConstructRegistry.addArrowMaterial(MaterialID.Bone, 1.69F, 1.0F); // Bone + TConstructRegistry.addArrowMaterial(MaterialID.Obsidian, 2.4F, 1.0F); // Obsidian + TConstructRegistry.addArrowMaterial(MaterialID.Netherrack, 1.5F, 1.3F); // Netherrack + TConstructRegistry.addArrowMaterial(MaterialID.Slime, 0.22F, 0.0F); // Slime + TConstructRegistry.addArrowMaterial(MaterialID.Paper, 0.69F, 10.0F); // Paper + TConstructRegistry.addArrowMaterial(MaterialID.Cobalt, 3.0F, 2.0f); // Cobalt + TConstructRegistry.addArrowMaterial(MaterialID.Ardite, 1.25F, 2.0f); // Ardite + TConstructRegistry.addArrowMaterial(MaterialID.Manyullyn, 2.25F, 1.0F); // Manyullyn + TConstructRegistry.addArrowMaterial(MaterialID.Copper, 2.7F, 1.1F); // Copper + TConstructRegistry.addArrowMaterial(MaterialID.Bronze, 3.2F, 1.2f); // Bronze + TConstructRegistry.addArrowMaterial(MaterialID.Alumite, 1.1F, 0.7f); // Alumite + TConstructRegistry.addArrowMaterial(MaterialID.Steel, 3.6F, 0.9f); // Steel + TConstructRegistry.addArrowMaterial(MaterialID.BlueSlime, 0.22F, 0.0F); // Blue Slime + TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.0F, 0.5F); // Pigiron // Arrow Shaft Materials: Material ID, crafting item, durability-medifier, mass, fragility - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(1, Items.bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: heavier, but durable - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(2, Items.reeds, 1.5f, 0.5f, 0.66f, 0xc7ff87)); // reed: light, but less durable - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(3, Items.blaze_rod, 1.2f, 0.9f, 0.08f, 0xfff32d)); // blaze: tad lighter, tad more durable, fieryyyy + TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( + 0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance + TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( + 1, Items.bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: heavier, but durable + TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( + 2, Items.reeds, 1.5f, 0.5f, 0.66f, 0xc7ff87)); // reed: light, but less durable + TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( + 3, Items.blaze_rod, 1.2f, 0.9f, 0.08f, 0xfff32d)); // blaze: tad lighter, tad more durable, fieryyyy // also add the tool rod variants, same stats - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(0, TinkerTools.toolRod, MaterialID.Wood, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance - TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(1, TinkerTools.toolRod, MaterialID.Bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: heavier, but durable + TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( + 0, + TinkerTools.toolRod, + MaterialID.Wood, + 1.0f, + 1.0f, + 0.15f, + 0x866526)); // wood: reference material, 10% break chance + TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial( + 1, TinkerTools.toolRod, MaterialID.Bone, 0.95f, 1.8f, 0.02f, 0xede6bf)); // bone: heavier, but durable // Arrow Fletching Materials - TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TinkerWeaponry.fletching, 1, 0), 95F, 0.05F, 1.0f, 0xffffff); // Feather - TConstructRegistry.addCustomMaterial(new FletchlingLeafMaterial(1, 2, "treeLeaves", new ItemStack(TinkerWeaponry.fletching, 1, 1), 75F, 0F, 2.5f)); // all vanilla and oredicted leaves. and all leaves in general. - TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TinkerTools.materials, 1, 1), new ItemStack(TinkerWeaponry.fletching, 1, 2), 100F, 0.005F, 0.8f, 0x82c873); // Slime - TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TinkerTools.materials, 1, 17), new ItemStack(TinkerWeaponry.fletching, 1, 3), 100F, 0.005F, 0.8f, 0x74c8c7); // BlueSlime - TConstructRegistry.addFletchingMaterial(4, 2, new ItemStack(TinkerWorld.slimeLeaves, 1, 0), new ItemStack(TinkerWeaponry.fletching, 1, 4), 98F, 0.02F, 1.4F, 0x74e8c7); // Slime leaves + TConstructRegistry.addFletchingMaterial( + 0, + 2, + new ItemStack(Items.feather), + new ItemStack(TinkerWeaponry.fletching, 1, 0), + 95F, + 0.05F, + 1.0f, + 0xffffff); // Feather + TConstructRegistry.addCustomMaterial(new FletchlingLeafMaterial( + 1, + 2, + "treeLeaves", + new ItemStack(TinkerWeaponry.fletching, 1, 1), + 75F, + 0F, + 2.5f)); // all vanilla and oredicted leaves. and all leaves in general. + TConstructRegistry.addFletchingMaterial( + 2, + 2, + new ItemStack(TinkerTools.materials, 1, 1), + new ItemStack(TinkerWeaponry.fletching, 1, 2), + 100F, + 0.005F, + 0.8f, + 0x82c873); // Slime + TConstructRegistry.addFletchingMaterial( + 3, + 2, + new ItemStack(TinkerTools.materials, 1, 17), + new ItemStack(TinkerWeaponry.fletching, 1, 3), + 100F, + 0.005F, + 0.8f, + 0x74c8c7); // BlueSlime + TConstructRegistry.addFletchingMaterial( + 4, + 2, + new ItemStack(TinkerWorld.slimeLeaves, 1, 0), + new ItemStack(TinkerWeaponry.fletching, 1, 4), + 98F, + 0.02F, + 1.4F, + 0x74e8c7); // Slime leaves // Bowstring Materials - TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TinkerWeaponry.bowstring, 1, 0), 1F, 1F, 1f, 0xeeeeee); // String + TConstructRegistry.addBowstringMaterial( + 0, + 2, + new ItemStack(Items.string), + new ItemStack(TinkerWeaponry.bowstring, 1, 0), + 1F, + 1F, + 1f, + 0xeeeeee); // String } - private void addWeaponRecipies() - { + private void addWeaponRecipies() { TConstructRegistry.addToolRecipe(shuriken, partShuriken, partShuriken, partShuriken, partShuriken); TConstructRegistry.addToolRecipe(throwingknife, TinkerTools.knifeBlade, TinkerTools.toolRod); TConstructRegistry.addToolRecipe(javelin, arrowhead, TinkerTools.toughRod, TinkerTools.toughRod); TConstructRegistry.addToolRecipe(shortbow, partBowLimb, bowstring, partBowLimb); TConstructRegistry.addToolRecipe(longbow, partBowLimb, bowstring, partBowLimb, TinkerTools.largePlate); - TConstructRegistry.addToolRecipe(crossbow, partCrossbowLimb, partCrossbowBody, bowstring, TinkerTools.toughBinding); + TConstructRegistry.addToolRecipe( + crossbow, partCrossbowLimb, partCrossbowBody, bowstring, TinkerTools.toughBinding); TConstructRegistry.addToolRecipe(arrowAmmo, arrowhead, partArrowShaft, fletching); TConstructRegistry.addToolRecipe(boltAmmo, partBolt, partBolt, fletching); } - private void registerBoltCasting() - { - if(PHConstruct.alternativeBoltRecipe) - GameRegistry.addRecipe(new AlternateBoltRecipe()); + private void registerBoltCasting() { + if (PHConstruct.alternativeBoltRecipe) GameRegistry.addRecipe(new AlternateBoltRecipe()); LiquidCasting tb = TConstructRegistry.getTableCasting(); // any fluid that is a toolpart material can be used - for(Map.Entry entry : FluidType.fluidTypes.entrySet()) { + for (Map.Entry entry : FluidType.fluidTypes.entrySet()) { // is tool material? - if(!entry.getValue().isToolpart) - continue; + if (!entry.getValue().isToolpart) continue; // get a casting recipe for it D: FluidStack liquid = new FluidStack(entry.getValue().fluid, TConstruct.ingotLiquidValue); - CastingRecipe recipe = tb.getCastingRecipe(liquid, new ItemStack(TinkerSmeltery.metalPattern, 1, 2)); // pickaxe + CastingRecipe recipe = + tb.getCastingRecipe(liquid, new ItemStack(TinkerSmeltery.metalPattern, 1, 2)); // pickaxe // no recipe found - if(recipe == null) - continue; + if (recipe == null) continue; // material id for the pickaxe head == material id for the fluid! such hack. wow. int matID = recipe.getResult().getItemDamage(); // register our casting stuff - for(Integer id : TConstructRegistry.toolMaterials.keySet()) { + for (Integer id : TConstructRegistry.toolMaterials.keySet()) { ItemStack rod = new ItemStack(TinkerTools.toolRod, 1, id); - if(((IToolPart)TinkerTools.toolRod).getMaterialID(rod) == -1) - continue; + if (((IToolPart) TinkerTools.toolRod).getMaterialID(rod) == -1) continue; - tb.addCastingRecipe(DualMaterialToolPart.createDualMaterial(partBolt, id, matID), liquid, rod, true, 150); + tb.addCastingRecipe( + DualMaterialToolPart.createDualMaterial(partBolt, id, matID), liquid, rod, true, 150); } } } - private void setupCreativeTab() - { + private void setupCreativeTab() { ItemStack tool = new ItemStack(TinkerWeaponry.longbow, 1, 0); NBTTagCompound compound = new NBTTagCompound(); diff --git a/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java b/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java index 5e7a159e1aa..eb8d23e2b3a 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java +++ b/src/main/java/tconstruct/weaponry/WeaponryActiveToolMod.java @@ -10,29 +10,23 @@ public class WeaponryActiveToolMod extends ActiveToolMod { @Override public boolean damageTool(ItemStack stack, int damage, EntityLivingBase entity) { // does not proc on tool 'healing' - if(stack.getItem() == TinkerWeaponry.javelin && stack.hasTagCompound() && damage > 0) { + if (stack.getItem() == TinkerWeaponry.javelin && stack.hasTagCompound() && damage > 0) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - IAmmo ammo =(IAmmo)stack.getItem(); - if(tags.getInteger("Damage") == 0) - { + IAmmo ammo = (IAmmo) stack.getItem(); + if (tags.getInteger("Damage") == 0) { int rem = ammo.consumeAmmo(1, stack); - if(rem > 0) - return true; - } - else if(ammo.getAmmoCount(stack) > 0) - { + if (rem > 0) return true; + } else if (ammo.getAmmoCount(stack) > 0) { int d = tags.getInteger("Damage") + damage; int max = tags.getInteger("TotalDurability"); - if(d > max) - { + if (d > max) { tags.setInteger("Damage", 0); return true; } } } // all other ammo items can't be damaged - else if(stack.getItem() instanceof IAmmo) - return true; + else if (stack.getItem() instanceof IAmmo) return true; return false; } diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java index 8cf9fdffc75..cb16a7b374d 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java @@ -1,10 +1,20 @@ package tconstruct.weaponry; +import static tconstruct.weaponry.TinkerWeaponry.*; + +import cpw.mods.fml.client.registry.RenderingRegistry; import mantle.lib.client.MantleClientRegistry; import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; import tconstruct.client.AmmoItemRenderer; +import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.entity.ProjectileBase; +import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; +import tconstruct.util.Reference; import tconstruct.weaponry.client.AmmoSlotHandler; import tconstruct.weaponry.client.CrosshairHandler; import tconstruct.weaponry.client.RenderEventHandler; @@ -14,17 +24,6 @@ import tconstruct.weaponry.client.entity.ShurikenEntityRenderer; import tconstruct.weaponry.client.item.*; import tconstruct.weaponry.entity.*; -import tconstruct.util.Reference; -import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.StencilBuilder; -import tconstruct.library.tools.ToolCore; -import tconstruct.tools.TinkerTools; - -import static tconstruct.weaponry.TinkerWeaponry.*; public class WeaponryClientProxy extends WeaponryCommonProxy { public static AmmoItemRenderer renderer; @@ -45,8 +44,7 @@ public void init() { registerManualIcons(); } - private void registerRenderers() - { + private void registerRenderers() { renderer = new AmmoItemRenderer(); MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.shuriken, renderer); MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.throwingknife, new ThrowingKnifeRenderer()); @@ -59,11 +57,10 @@ private void registerRenderers() MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.arrowAmmo, renderer); MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.boltAmmo, renderer); - //MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.boneana, ); + // MinecraftForgeClient.registerItemRenderer(TinkerWeaponry.boneana, ); } - private void registerEntityRendering() - { + private void registerEntityRendering() { ProjectileBaseRenderer defaultRenderer = new ProjectileBaseRenderer(); RenderingRegistry.registerEntityRenderingHandler(ShurikenEntity.class, new ShurikenEntityRenderer()); RenderingRegistry.registerEntityRenderingHandler(ThrowingKnifeEntity.class, defaultRenderer); @@ -72,47 +69,44 @@ private void registerEntityRendering() RenderingRegistry.registerEntityRenderingHandler(BoltEntity.class, new ArrowEntityRenderer(0.8f)); } - private void registerMaterialRendering() - { + private void registerMaterialRendering() { ToolCore arrow = TinkerWeaponry.arrowAmmo; String pre = Reference.resource(arrow.getDefaultFolder()) + "/"; String[] shaft = {"wood", "bone", "reed", "blaze", null}; - String[] fletching = { "feather", "leaf", "slime", "blueslime", "slimeleaf" }; + String[] fletching = {"feather", "leaf", "slime", "blueslime", "slimeleaf"}; // we register different textures for the different parts per index - for(int i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { String handletex = pre + shaft[i] + arrow.getIconSuffix(2); String acctex = pre + fletching[i] + arrow.getIconSuffix(3); - arrow.registerAlternatePartPaths(i, new String[]{null, null, handletex, acctex}); - TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[]{null, null, null, acctex}); + arrow.registerAlternatePartPaths(i, new String[] {null, null, handletex, acctex}); + TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[] {null, null, null, acctex}); } // for bolts too pre = Reference.resource(TinkerWeaponry.boltAmmo.getDefaultFolder()) + "/"; - for(int i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { String acctex = pre + fletching[i] + TinkerWeaponry.boltAmmo.getIconSuffix(3); - TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[]{null, null, null, acctex}); + TinkerWeaponry.boltAmmo.registerAlternatePartPaths(i, new String[] {null, null, null, acctex}); } - // bowstring - String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; - for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) - { - TConstructClientRegistry.addAlternateMaterialRenderMapping(TinkerWeaponry.shortbow, bowIter, Reference.RESOURCE, bowstringTypes[bowIter], true); + String[] bowstringTypes = {"string", "magicfabric", "flamestring"}; + for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) { + TConstructClientRegistry.addAlternateMaterialRenderMapping( + TinkerWeaponry.shortbow, bowIter, Reference.RESOURCE, bowstringTypes[bowIter], true); } } - private void buttons() - { + private void buttons() { final String tex = "textures/gui/icons.png"; // Stencil Table TConstructClientRegistry.addStencilButton2(11, 3, 21, Reference.RESOURCE, tex); // arrow head TConstructClientRegistry.addStencilButton2(12, 3, 22, Reference.RESOURCE, tex); // fletchling - TConstructClientRegistry.addStencilButton2(0,0, -1, null, null); - TConstructClientRegistry.addStencilButton2(0,0, -1, null, null); + TConstructClientRegistry.addStencilButton2(0, 0, -1, null, null); + TConstructClientRegistry.addStencilButton2(0, 0, -1, null, null); TConstructClientRegistry.addStencilButton2(3, 4, 27, Reference.RESOURCE, tex); // bow limb TConstructClientRegistry.addStencilButton2(10, 3, 23, Reference.RESOURCE, tex); // bowstring @@ -120,59 +114,93 @@ private void buttons() TConstructClientRegistry.addStencilButton2(2, 4, 26, Reference.RESOURCE, tex); // crossbow body TConstructClientRegistry.addStencilButton2(0, 4, 24, Reference.RESOURCE, tex); // shuriken - //TConstructClientRegistry.addStencilButton2(4, 4, index, Reference.RESOURCE, "textures/gui/icons.png"); // bolt - + // TConstructClientRegistry.addStencilButton2(4, 4, index, Reference.RESOURCE, "textures/gui/icons.png"); // + // bolt // Tool Station ToolCore[] tools = {shortbow, arrowAmmo, throwingknife, javelin}; int[][] icons = { - new int[] {3, 9, 1}, // shortbow - new int[] {7, 10, 1}, // arrow - new int[] {2, 1, 5}, // throwingknife - new int[] {1, 2, 5} // javelin + new int[] {3, 9, 1}, // shortbow + new int[] {7, 10, 1}, // arrow + new int[] {2, 1, 5}, // throwingknife + new int[] {1, 2, 5} // javelin }; int[][] coords = { - new int[] { 3, 10, 3, 13 }, new int[] { 4, 3, 4, 13 }, // shortbow - new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, // arrow - new int[] { 7, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // throwingknife - new int[] { 11, 8, 8, 13 }, new int[] { 3, 3, 3, 13 } // javelin + new int[] {3, 10, 3, 13}, new int[] {4, 3, 4, 13}, // shortbow + new int[] {11, 0, 12, 13}, new int[] {3, 3, 3, 13}, // arrow + new int[] {7, 0, 13, 13}, new int[] {2, 3, 13, 13}, // throwingknife + new int[] {11, 8, 8, 13}, new int[] {3, 3, 3, 13} // javelin }; - for (int i = 0; i < tools.length; i++) - { - String locString = String.format("gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); - TConstructClientRegistry.addToolButton(icons[i][0], icons[i][1], icons[i][2], coords[i*2], coords[i*2+1], tools[i].getLocalizedToolName(), locString, Reference.RESOURCE, tex); + for (int i = 0; i < tools.length; i++) { + String locString = String.format( + "gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); + TConstructClientRegistry.addToolButton( + icons[i][0], + icons[i][1], + icons[i][2], + coords[i * 2], + coords[i * 2 + 1], + tools[i].getLocalizedToolName(), + locString, + Reference.RESOURCE, + tex); } // Tool Forge tools = new ToolCore[] {longbow, crossbow, boltAmmo, shuriken}; icons = new int[][] { - new int[] {8, 11, 1}, // longbow - new int[] {9, 12, 1}, // crossbow - new int[] {2, 13, 1}, // bolt - new int[] {4, 0, 5} // shuriken + new int[] {8, 11, 1}, // longbow + new int[] {9, 12, 1}, // crossbow + new int[] {2, 13, 1}, // bolt + new int[] {4, 0, 5} // shuriken }; coords = new int[][] { - new int[] { 3, 10, 3, 9 }, new int[] { 4, 3, 4, 2 }, // longbow - new int[] { 1, 2, 10, 9 }, new int[] { 4, 4, 3, 3 }, // crossbow - new int[] { 4, 12, 13, 13 }, new int[] { 4, 3, 13, 13 }, // bolt - new int[] { 0, 0, 0, 0 }, new int[] { 4, 4, 4, 4 } // shuriken + new int[] {3, 10, 3, 9}, new int[] {4, 3, 4, 2}, // longbow + new int[] {1, 2, 10, 9}, new int[] {4, 4, 3, 3}, // crossbow + new int[] {4, 12, 13, 13}, new int[] {4, 3, 13, 13}, // bolt + new int[] {0, 0, 0, 0}, new int[] {4, 4, 4, 4} // shuriken }; - for (int i = 0; i < tools.length; i++) - { - String locString = String.format("gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); - TConstructClientRegistry.addTierTwoButton(icons[i][0], icons[i][1], icons[i][2], coords[i*2], coords[i*2+1], tools[i].getLocalizedToolName(), locString, Reference.RESOURCE, tex); + for (int i = 0; i < tools.length; i++) { + String locString = String.format( + "gui.toolstation.%s.desc", tools[i].getToolName().toLowerCase()); + TConstructClientRegistry.addTierTwoButton( + icons[i][0], + icons[i][1], + icons[i][2], + coords[i * 2], + coords[i * 2 + 1], + tools[i].getLocalizedToolName(), + locString, + Reference.RESOURCE, + tex); } } - /* Manual Stuff */ - public void registerManualIcons () - { - MantleClientRegistry.registerManualIcon("throwingknifeIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, TinkerTools.MaterialID.Iron), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.partBowLimb, 1, TinkerTools.MaterialID.Wood), new ItemStack(TinkerWeaponry.bowstring, 1, 0), new ItemStack(TinkerWeaponry.partBowLimb, 1, TinkerTools.MaterialID.Wood), "")); - MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.arrowhead, 1, TinkerTools.MaterialID.Flint), new ItemStack(Items.stick), new ItemStack(TinkerWeaponry.fletching, 1, 0), "")); + public void registerManualIcons() { + MantleClientRegistry.registerManualIcon( + "throwingknifeIcon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerTools.knifeBlade, 1, TinkerTools.MaterialID.Iron), + new ItemStack(TinkerTools.toolRod, 1, 11), + null, + "")); + MantleClientRegistry.registerManualIcon( + "shortbowIcon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerWeaponry.partBowLimb, 1, TinkerTools.MaterialID.Wood), + new ItemStack(TinkerWeaponry.bowstring, 1, 0), + new ItemStack(TinkerWeaponry.partBowLimb, 1, TinkerTools.MaterialID.Wood), + "")); + MantleClientRegistry.registerManualIcon( + "arrowIcon", + ToolBuilder.instance.buildTool( + new ItemStack(TinkerWeaponry.arrowhead, 1, TinkerTools.MaterialID.Flint), + new ItemStack(Items.stick), + new ItemStack(TinkerWeaponry.fletching, 1, 0), + "")); MantleClientRegistry.registerManualIcon("weaponrybook", new ItemStack(TinkerTools.manualBook, 1, 4)); } diff --git a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java index bce2b81bbce..d943a324e99 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java @@ -1,13 +1,14 @@ package tconstruct.weaponry; +import cpw.mods.fml.common.registry.EntityRegistry; import tconstruct.TConstruct; import tconstruct.weaponry.entity.*; -import cpw.mods.fml.common.registry.EntityRegistry; public class WeaponryCommonProxy { public void init() { EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 20, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 21, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity( + ThrowingKnifeEntity.class, "ThrowingKnife", 21, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 22, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 23, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 24, TConstruct.instance, 32, 5, true); diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index 7769db43462..8f765db42bc 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -2,58 +2,53 @@ import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import tconstruct.armor.player.TPlayerStats; +import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.entity.ProjectileBase; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.event.SmelteryCastEvent; +import tconstruct.library.event.ToolBuildEvent; +import tconstruct.library.event.ToolCraftEvent; +import tconstruct.library.tools.*; +import tconstruct.library.tools.DualMaterialToolPart; import tconstruct.library.util.IToolPart; +import tconstruct.library.weaponry.ArrowShaftMaterial; +import tconstruct.library.weaponry.BowBaseAmmo; +import tconstruct.library.weaponry.IAmmo; +import tconstruct.library.weaponry.ProjectileWeapon; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.weaponry.ammo.ArrowAmmo; import tconstruct.weaponry.ammo.BoltAmmo; -import tconstruct.library.tools.DualMaterialToolPart; -import tconstruct.library.weaponry.ArrowShaftMaterial; -import tconstruct.library.weaponry.BowBaseAmmo; -import tconstruct.library.weaponry.ProjectileWeapon; -import tconstruct.library.weaponry.IAmmo; import tconstruct.weaponry.weapons.Crossbow; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.event.ToolBuildEvent; -import tconstruct.library.event.ToolCraftEvent; -import tconstruct.library.tools.*; import tconstruct.weaponry.weapons.LongBow; import tconstruct.weaponry.weapons.ShortBow; public class WeaponryHandler { @SubscribeEvent - public void onCrafting (PlayerEvent.ItemCraftedEvent event) - { + public void onCrafting(PlayerEvent.ItemCraftedEvent event) { Item item = event.crafting.getItem(); - if (!event.player.worldObj.isRemote) - { - if (item == Item.getItemFromBlock(TinkerTools.toolStationWood)) - { - if (!PHConstruct.beginnerBook) - { + if (!event.player.worldObj.isRemote) { + if (item == Item.getItemFromBlock(TinkerTools.toolStationWood)) { + if (!PHConstruct.beginnerBook) { return; } TPlayerStats stats = TPlayerStats.get(event.player); - if (!stats.weaponryManual) - { + if (!stats.weaponryManual) { stats.weaponryManual = true; AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TinkerTools.manualBook, 1, 4)); } @@ -63,44 +58,46 @@ public void onCrafting (PlayerEvent.ItemCraftedEvent event) // Provides ammo-items with the necessary NBT @SubscribeEvent - public void onAmmoCrafted(ToolCraftEvent.NormalTool event) - { - if(!(event.tool instanceof IAmmo)) - return; + public void onAmmoCrafted(ToolCraftEvent.NormalTool event) { + if (!(event.tool instanceof IAmmo)) return; NBTTagCompound tags = event.toolTag.getCompoundTag("InfiTool"); // calculate its stats - if(event.tool instanceof ArrowAmmo) - { + if (event.tool instanceof ArrowAmmo) { // arrows work like this: // the head is responsible for the damage, but also adds weight // the shaft defines how fragile the arrow is, and also adds to the weight a bit. But mostly the fragility. - // the fletching defines the accuracy of the arrow and adds a bit breakchance. Mostly there for the durability modifier because availability + // the fletching defines the accuracy of the arrow and adds a bit breakchance. Mostly there for the + // durability modifier because availability // Shortbows work better with lighter arrows - // while Longbows require a bit heavier arrows, the lighter the arrow the more impact the accuracy has otherwise + // while Longbows require a bit heavier arrows, the lighter the arrow the more impact the accuracy has + // otherwise // summa sumarum: heavier arrows fall faster (less range) but accuracy has less impact // the materials ToolMaterial head = TConstructRegistry.getMaterial(tags.getInteger("Head")); ArrowMaterial arrow = TConstructRegistry.getArrowMaterial(tags.getInteger("Head")); - ArrowShaftMaterial shaft = (ArrowShaftMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Handle"), ArrowShaftMaterial.class); - FletchingMaterial fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); + ArrowShaftMaterial shaft = (ArrowShaftMaterial) + TConstructRegistry.getCustomMaterial(tags.getInteger("Handle"), ArrowShaftMaterial.class); + FletchingMaterial fletching = (FletchingMaterial) + TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); // todo: fix leaf fletching - if(fletching == null) - fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchlingLeafMaterial.class); + if (fletching == null) + fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial( + tags.getInteger("Accessory"), FletchlingLeafMaterial.class); // invalid materials - if(arrow == null || shaft == null || fletching == null) - { + if (arrow == null || shaft == null || fletching == null) { event.setResult(Event.Result.DENY); return; } - int durability = (int)((float)head.durability() * shaft.durabilityModifier * fletching.durabilityModifier); + int durability = + (int) ((float) head.durability() * shaft.durabilityModifier * fletching.durabilityModifier); float weight = arrow.mass + shaft.weight; float accuracy = fletching.accuracy; float breakChance = shaft.fragility * arrow.breakChance + fletching.breakChance; @@ -108,16 +105,13 @@ public void onAmmoCrafted(ToolCraftEvent.NormalTool event) setAmmoData(tags, durability, weight, breakChance, accuracy, head.shoddy(), head.reinforced()); // Blaze shafts give fiery - if(tags.getInteger("Handle") == 3) - { + if (tags.getInteger("Handle") == 3) { tags.setInteger("Fiery", 5); } // arrows get only 2 modifiers (so one less) by default - int mods = Math.max(0, tags.getInteger("Modifiers")-1); + int mods = Math.max(0, tags.getInteger("Modifiers") - 1); tags.setInteger("Modifiers", mods); - } - else if(event.tool instanceof BoltAmmo) - { + } else if (event.tool instanceof BoltAmmo) { // bolts work like ammos, but have more weight as they have 2 main materials // Crossbows work better with heavier bolts @@ -126,29 +120,31 @@ else if(event.tool instanceof BoltAmmo) ToolMaterial coreMat = TConstructRegistry.getMaterial(tags.getInteger("Handle")); ArrowMaterial head = TConstructRegistry.getArrowMaterial(tags.getInteger("Head")); ArrowMaterial core = TConstructRegistry.getArrowMaterial(tags.getInteger("Handle")); - FletchingMaterial fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); + FletchingMaterial fletching = (FletchingMaterial) + TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchingMaterial.class); // todo: fix leaf fletching - if(fletching == null) - fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), FletchlingLeafMaterial.class); + if (fletching == null) + fletching = (FletchingMaterial) TConstructRegistry.getCustomMaterial( + tags.getInteger("Accessory"), FletchlingLeafMaterial.class); // invalid materials - if(head == null || core == null || fletching == null) - { + if (head == null || core == null || fletching == null) { event.setResult(Event.Result.DENY); return; } - int durability = (int)((float)headMat.durability() * coreMat.handleDurability() * fletching.durabilityModifier); - float weight = head.mass + core.mass*1.5f; - float accuracy = (100f + fletching.accuracy)/2f; - float breakChance = (fletching.breakChance*2 + 0.15f * core.breakChance) * head.breakChance/2f; - float shoddy = (headMat.shoddy() + coreMat.shoddy())/2f; + int durability = + (int) ((float) headMat.durability() * coreMat.handleDurability() * fletching.durabilityModifier); + float weight = head.mass + core.mass * 1.5f; + float accuracy = (100f + fletching.accuracy) / 2f; + float breakChance = (fletching.breakChance * 2 + 0.15f * core.breakChance) * head.breakChance / 2f; + float shoddy = (headMat.shoddy() + coreMat.shoddy()) / 2f; int reinforced = Math.max(headMat.reinforced(), coreMat.reinforced()); setAmmoData(tags, durability, weight, breakChance, accuracy, shoddy, reinforced); - int mods = Math.max(0, tags.getInteger("Modifiers")-1); + int mods = Math.max(0, tags.getInteger("Modifiers") - 1); tags.setInteger("Modifiers", mods); } @@ -159,13 +155,11 @@ else if(event.tool instanceof BoltAmmo) } @SubscribeEvent - public void onProjectileWeaponCrafted(ToolCraftEvent.NormalTool event) - { - if(!(event.tool instanceof ProjectileWeapon)) - return; + public void onProjectileWeaponCrafted(ToolCraftEvent.NormalTool event) { + if (!(event.tool instanceof ProjectileWeapon)) return; NBTTagCompound tags = event.toolTag.getCompoundTag("InfiTool"); - ProjectileWeapon weapon = (ProjectileWeapon)event.tool; + ProjectileWeapon weapon = (ProjectileWeapon) event.tool; int drawSpeed = 0; float flightSpeed = 0; @@ -176,61 +170,58 @@ public void onProjectileWeaponCrafted(ToolCraftEvent.NormalTool event) boolean enchanted = false; - if(event.tool instanceof BowBaseAmmo) { + if (event.tool instanceof BowBaseAmmo) { top = TConstructRegistry.getBowMaterial(tags.getInteger("Head")); bottom = TConstructRegistry.getBowMaterial(tags.getInteger("Accessory")); - string = (BowstringMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Handle"), BowstringMaterial.class); + string = (BowstringMaterial) + TConstructRegistry.getCustomMaterial(tags.getInteger("Handle"), BowstringMaterial.class); // some materials seem to be incompatible - if(top == null || bottom == null || string == null) - { + if (top == null || bottom == null || string == null) { event.setResult(Event.Result.DENY); return; } drawSpeed = (int) ((top.drawspeed + bottom.drawspeed) / 2f * string.drawspeedModifier); - flightSpeed = (top.flightSpeedMax + bottom.flightSpeedMax)/2 * string.flightSpeedModifier; + flightSpeed = (top.flightSpeedMax + bottom.flightSpeedMax) / 2 * string.flightSpeedModifier; // SHORT bows have a SHORTER windup because they're SHORT. hahahaha.... get it? - if(event.tool instanceof ShortBow) { + if (event.tool instanceof ShortBow) { drawSpeed *= 0.9; } // longbows have LONGER drawspeed. LOGIC! - if(event.tool instanceof LongBow) { + if (event.tool instanceof LongBow) { drawSpeed *= 1.8f; flightSpeed *= 1.5f; } // enchanted bowstring enchanted = tags.getInteger("Handle") == 1; - } - else if(event.tool instanceof Crossbow) - { + } else if (event.tool instanceof Crossbow) { top = TConstructRegistry.getBowMaterial(tags.getInteger("Head")); - string = (BowstringMaterial) TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), BowstringMaterial.class); + string = (BowstringMaterial) + TConstructRegistry.getCustomMaterial(tags.getInteger("Accessory"), BowstringMaterial.class); // some materials seem to be incompatible - if(top == null || string == null) - { + if (top == null || string == null) { event.setResult(Event.Result.DENY); return; } - drawSpeed = (int) ((float)top.drawspeed * string.drawspeedModifier); + drawSpeed = (int) ((float) top.drawspeed * string.drawspeedModifier); flightSpeed = (top.flightSpeedMax * string.flightSpeedModifier); - // crossbows are more efficient the higher the base drawspeed is. So the higher the drawspeed, the more bonus you get + // crossbows are more efficient the higher the base drawspeed is. So the higher the drawspeed, the more + // bonus you get drawSpeed *= 2.5f; - drawSpeed -= drawSpeed*0.25f; + drawSpeed -= drawSpeed * 0.25f; // crossbows are stronk flightSpeed *= 1.5; // enchanted bowstring enchanted = tags.getInteger("Accessory") == 1; - } - else - return; + } else return; // enchanted fabric if (enchanted) { @@ -244,47 +235,41 @@ else if(event.tool instanceof Crossbow) tags.setFloat("FlightSpeed", flightSpeed); } - // arrows use custom materials. But we don't allow the creation of those items // we therefore replace the items with their toolpart counterparts here @SubscribeEvent - public void buildArrow(ToolBuildEvent event) - { - if(event.headStack == null || event.handleStack == null || event.accessoryStack == null) - return; + public void buildArrow(ToolBuildEvent event) { + if (event.headStack == null || event.handleStack == null || event.accessoryStack == null) return; // are we building an arrow? CustomMaterial mat = TConstructRegistry.getCustomMaterial(event.handleStack, ArrowShaftMaterial.class); - if(mat == null) - return; + if (mat == null) return; Item extra = event.extraStack != null ? event.extraStack.getItem() : null; - ToolCore tool = ToolBuilder.instance.getMatchingRecipe(event.headStack.getItem(), mat.craftingItem.getItem(), event.accessoryStack.getItem(), extra); + ToolCore tool = ToolBuilder.instance.getMatchingRecipe( + event.headStack.getItem(), mat.craftingItem.getItem(), event.accessoryStack.getItem(), extra); // it's an arrow! - if(tool == TinkerWeaponry.arrowAmmo) - event.handleStack = mat.craftingItem.copy(); + if (tool == TinkerWeaponry.arrowAmmo) event.handleStack = mat.craftingItem.copy(); } // bolts require special treatment because of their dual-material cores @SubscribeEvent - public void buildBolt(ToolBuildEvent event) - { - if(event.headStack == null || event.handleStack == null) - return; + public void buildBolt(ToolBuildEvent event) { + if (event.headStack == null || event.handleStack == null) return; - if(event.headStack.getItem() != TinkerWeaponry.partBolt) - return; + if (event.headStack.getItem() != TinkerWeaponry.partBolt) return; // is the bolt already split into 2 items? - if(event.accessoryStack != null && event.headStack.getItem() == TinkerWeaponry.partBolt && event.handleStack.getItem() == TinkerWeaponry.partBolt && event.accessoryStack.getItem() == TinkerWeaponry.fletching) - return; + if (event.accessoryStack != null + && event.headStack.getItem() == TinkerWeaponry.partBolt + && event.handleStack.getItem() == TinkerWeaponry.partBolt + && event.accessoryStack.getItem() == TinkerWeaponry.fletching) return; // split the bolt into its two parts ItemStack bolt1 = event.headStack.copy(); ItemStack bolt2 = event.headStack; ItemStack fletching = event.handleStack; - // set the correct material on the 2nd part DualMaterialToolPart dualPart = (DualMaterialToolPart) bolt2.getItem(); bolt1.setItemDamage(dualPart.getMaterialID2(bolt1)); @@ -295,8 +280,14 @@ public void buildBolt(ToolBuildEvent event) event.accessoryStack = fletching; } - private void setAmmoData(NBTTagCompound tags, int durability, float weight, float breakChance, float accuracy, float shoddy, int reinforced) - { + private void setAmmoData( + NBTTagCompound tags, + int durability, + float weight, + float breakChance, + float accuracy, + float shoddy, + int reinforced) { tags.setInteger("TotalDurability", durability); tags.setInteger("BaseDurability", durability); tags.setFloat("Mass", weight); @@ -307,80 +298,79 @@ private void setAmmoData(NBTTagCompound tags, int durability, float weight, floa } @SubscribeEvent - public void weaponryPartCrafted(PartBuilderEvent.NormalPart event) - { - if(event.pattern == null) - return; + public void weaponryPartCrafted(PartBuilderEvent.NormalPart event) { + if (event.pattern == null) return; // weaponry part - if(event.pattern.getItem() == TinkerWeaponry.woodPattern) { + if (event.pattern.getItem() == TinkerWeaponry.woodPattern) { // crossbow or bow limb if (event.pattern.getItemDamage() == 1 || event.pattern.getItemDamage() == 3) { // only allow crafting if the material has bow stats - PatternBuilder.ItemKey key = PatternBuilder.instance.getItemKey(event.material); - if(key == null) - return; + PatternBuilder.ItemKey key = PatternBuilder.instance.getItemKey(event.material); + if (key == null) return; PatternBuilder.MaterialSet ms = PatternBuilder.instance.materialSets.get(key.key); - if(ms == null) - return; + if (ms == null) return; - if(TConstructRegistry.getBowMaterial(ms.materialID) == null) - event.setResult(Event.Result.DENY); + if (TConstructRegistry.getBowMaterial(ms.materialID) == null) event.setResult(Event.Result.DENY); } } // arrow stats, still in tool - if(event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 25) { + if (event.pattern.getItem() == TinkerTools.woodPattern && event.pattern.getItemDamage() == 25) { // only allow crafting if the material has bow stats - PatternBuilder.ItemKey key = PatternBuilder.instance.getItemKey(event.material); - if(key == null) - return; + PatternBuilder.ItemKey key = PatternBuilder.instance.getItemKey(event.material); + if (key == null) return; PatternBuilder.MaterialSet ms = PatternBuilder.instance.materialSets.get(key.key); - if(ms == null) - return; + if (ms == null) return; - if(TConstructRegistry.getArrowMaterial(ms.materialID) == null) - event.setResult(Event.Result.DENY); + if (TConstructRegistry.getArrowMaterial(ms.materialID) == null) event.setResult(Event.Result.DENY); } } @SubscribeEvent public void weaponryPartCast(SmelteryCastEvent.CastingTable event) { - if (event.recipe == null || event.recipe.output == null) - return; + if (event.recipe == null || event.recipe.output == null) return; - if (!(event.recipe.output.getItem() instanceof IToolPart)) - return; + if (!(event.recipe.output.getItem() instanceof IToolPart)) return; // get material for the output int mat = ((IToolPart) event.recipe.output.getItem()).getMaterialID(event.recipe.output); // arrowhead if (event.recipe.output.getItem() == TinkerWeaponry.arrowhead) - if (TConstructRegistry.getArrowMaterial(mat) == null) - event.setResult(Event.Result.DENY); + if (TConstructRegistry.getArrowMaterial(mat) == null) event.setResult(Event.Result.DENY); // crossbow/bowlimb - if (event.recipe.output.getItem() == TinkerWeaponry.partBowLimb || event.recipe.output.getItem() == TinkerWeaponry.partCrossbowLimb) - if (TConstructRegistry.getBowMaterial(mat) == null) - event.setResult(Event.Result.DENY); + if (event.recipe.output.getItem() == TinkerWeaponry.partBowLimb + || event.recipe.output.getItem() == TinkerWeaponry.partCrossbowLimb) + if (TConstructRegistry.getBowMaterial(mat) == null) event.setResult(Event.Result.DENY); } // high priority because we want to do these checks on unmodified stacks @SubscribeEvent(priority = EventPriority.HIGH) public void boneanaParts(ToolBuildEvent event) { - if(event.headStack == null || event.handleStack == null || event.accessoryStack != null || event.extraStack != null) - return; + if (event.headStack == null + || event.handleStack == null + || event.accessoryStack != null + || event.extraStack != null) return; // golden carrot + bone - if(event.headStack.getItem() == Items.golden_carrot && event.handleStack.getItem() == Items.bone) - { + if (event.headStack.getItem() == Items.golden_carrot && event.handleStack.getItem() == Items.bone) { // golden carrot must be named banana - if(!event.headStack.hasTagCompound() || !event.headStack.getTagCompound().hasKey("display") || - !event.headStack.getTagCompound().getCompoundTag("display").hasKey("Name") || - !event.headStack.getTagCompound().getCompoundTag("display").getString("Name").toLowerCase().equals("banana")) - return; - event.name = '\u2400' + "Bonæna"; // the \u2400 is a non-printable unicode character so you can't just type it + if (!event.headStack.hasTagCompound() + || !event.headStack.getTagCompound().hasKey("display") + || !event.headStack + .getTagCompound() + .getCompoundTag("display") + .hasKey("Name") + || !event.headStack + .getTagCompound() + .getCompoundTag("display") + .getString("Name") + .toLowerCase() + .equals("banana")) return; + event.name = + '\u2400' + "Bonæna"; // the \u2400 is a non-printable unicode character so you can't just type it event.headStack = new ItemStack(TinkerTools.swordBlade, 1, TinkerTools.MaterialID.Bone); event.handleStack = new ItemStack(TinkerTools.toolRod, 1, TinkerTools.MaterialID.Bone); event.accessoryStack = new ItemStack(TinkerTools.wideGuard, 1, TinkerTools.MaterialID.Bone); @@ -390,8 +380,7 @@ public void boneanaParts(ToolBuildEvent event) { @SubscribeEvent(priority = EventPriority.HIGH) public void boneanaBuilding(ToolCraftEvent.NormalTool event) { // is it a boneana? - if("\u00A7f\u2400Bonæna".equals(event.toolTag.getCompoundTag("display").getString("Name"))) - { + if ("\u00A7f\u2400Bonæna".equals(event.toolTag.getCompoundTag("display").getString("Name"))) { // set correct name event.toolTag.getCompoundTag("display").setString("Name", EnumChatFormatting.YELLOW + "Bonæna"); // lore! @@ -422,9 +411,9 @@ public void boneanaBuilding(ToolCraftEvent.NormalTool event) { public void entityJoin(EntityJoinWorldEvent event) { // This prevents invalid projectiles to be created // This can happen because of ID remaps. - if(event.entity instanceof ProjectileBase) { + if (event.entity instanceof ProjectileBase) { ProjectileBase projectile = (ProjectileBase) event.entity; - if(projectile.returnStack == null || !(projectile.returnStack.getItem() instanceof ToolCore)) + if (projectile.returnStack == null || !(projectile.returnStack.getItem() instanceof ToolCore)) event.setCanceled(true); } } diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java index 012762a02a7..680eaab6dee 100644 --- a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java @@ -1,21 +1,19 @@ package tconstruct.weaponry.ammo; +import java.util.List; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.ArrowMaterial; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.FletchlingLeafMaterial; -import tconstruct.weaponry.TinkerWeaponry; import tconstruct.library.weaponry.AmmoItem; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import tconstruct.library.crafting.ToolBuilder; import tconstruct.tools.TinkerTools; - -import java.util.List; +import tconstruct.weaponry.TinkerWeaponry; public class ArrowAmmo extends AmmoItem { public static ItemStack vanillaArrow; @@ -25,10 +23,8 @@ public ArrowAmmo() { } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { + public String getIconSuffix(int partType) { + switch (partType) { case 0: return "_arrow_head"; case 1: @@ -43,33 +39,28 @@ public String getIconSuffix (int partType) } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_arrow_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "arrow"; } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); } @Override - public void registerAlternatePartPaths (int index, String[] location) - { + public void registerAlternatePartPaths(int index, String[] location) { handleStrings.put(index, location[2]); accessoryStrings.put(index, location[3]); } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerWeaponry.arrowhead; } @@ -79,8 +70,7 @@ public Item getHandleItem() { } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerWeaponry.fletching; } @@ -91,23 +81,20 @@ public int durabilityTypeHandle() { } @Override - public String[] getTraits () - { - return new String[] { "ammo", "projectile", "weapon" }; + public String[] getTraits() { + return new String[] {"ammo", "projectile", "weapon"}; } @Override - public void buildTool (int id, String name, List list) - { - if(TConstructRegistry.getArrowMaterial(id) == null) - return; + public void buildTool(int id, String name, List list) { + if (TConstructRegistry.getArrowMaterial(id) == null) return; ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // wooden shaft ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, null, ""); - if (tool != null) - { + ItemStack tool = ToolBuilder.instance.buildTool( + new ItemStack(getHeadItem(), 1, id), handleStack, accessoryStack, null, ""); + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); } @@ -123,25 +110,19 @@ public void getSubItems(Item id, CreativeTabs tab, List list) { ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling ItemStack tool = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, null, ""); - if (tool != null) - { + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); vanillaArrow = tool; - } - else - TConstruct.logger.error("Couldn't build vanilla equivalent of Tinker Arrow"); + } else TConstruct.logger.error("Couldn't build vanilla equivalent of Tinker Arrow"); } @Override protected int getDefaultColor(int renderPass, int materialID) { - if(renderPass != 2) - return super.getDefaultColor(renderPass, materialID); + if (renderPass != 2) return super.getDefaultColor(renderPass, materialID); CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class); - if(mat == null) - TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class); - if(mat == null) - return 0xffffff; + if (mat == null) TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class); + if (mat == null) return 0xffffff; return mat.color; } @@ -150,10 +131,9 @@ protected int getDefaultColor(int renderPass, int materialID) { @Override public String getAbilityNameForType(int type, int part) { // blaze shaft? - if(part == 1 && type == 3) - return "\u00a76" + StatCollector.translateToLocal("modifier.tool.blaze"); - if(part >= 1) // only head has ability otherwise - return ""; + if (part == 1 && type == 3) return "\u00a76" + StatCollector.translateToLocal("modifier.tool.blaze"); + if (part >= 1) // only head has ability otherwise + return ""; return super.getAbilityNameForType(type, part); } } diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java index 4ae28a74573..5e5abc66f6b 100644 --- a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java @@ -1,18 +1,17 @@ package tconstruct.weaponry.ammo; +import java.util.List; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.CustomMaterial; +import tconstruct.library.tools.DualMaterialToolPart; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.FletchlingLeafMaterial; +import tconstruct.library.weaponry.AmmoItem; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.library.tools.DualMaterialToolPart; -import tconstruct.library.weaponry.AmmoItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import tconstruct.library.crafting.ToolBuilder; - -import java.util.List; public class BoltAmmo extends AmmoItem { public BoltAmmo() { @@ -21,8 +20,7 @@ public BoltAmmo() { @Override public String getIconSuffix(int partType) { - switch (partType) - { + switch (partType) { case 0: return "_bolt_head"; case 1: @@ -47,15 +45,13 @@ public String getDefaultFolder() { } @Override - public void registerPartPaths (int index, String[] location) - { + public void registerPartPaths(int index, String[] location) { headStrings.put(index, location[0]); handleStrings.put(index, location[2]); } @Override - public void registerAlternatePartPaths (int index, String[] location) - { + public void registerAlternatePartPaths(int index, String[] location) { accessoryStrings.put(index, location[3]); } @@ -75,25 +71,22 @@ public Item getAccessoryItem() { } @Override - public String[] getTraits () - { - return new String[] { "ammo", "projectile", "weapon" }; + public String[] getTraits() { + return new String[] {"ammo", "projectile", "weapon"}; } @Override - public void buildTool (int id, String name, List list) - { - if(TConstructRegistry.getArrowMaterial(id) == null) - return; + public void buildTool(int id, String name, List list) { + if (TConstructRegistry.getArrowMaterial(id) == null) return; // dual material head: we use wooden shafts - ItemStack headStack = DualMaterialToolPart.createDualMaterial(getHeadItem(), id, TinkerTools.MaterialID.Iron); // material shaft + ItemStack headStack = DualMaterialToolPart.createDualMaterial( + getHeadItem(), id, TinkerTools.MaterialID.Iron); // material shaft ItemStack handleStack = new ItemStack(getAccessoryItem(), 1, 0); // feather Fletchling - //ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling + // ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling ItemStack tool = ToolBuilder.instance.buildTool(headStack, handleStack, null, null, ""); - if (tool != null) - { + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); } @@ -101,14 +94,11 @@ public void buildTool (int id, String name, List list) @Override protected int getDefaultColor(int renderPass, int materialID) { - if(renderPass != 2) - return super.getDefaultColor(renderPass, materialID); + if (renderPass != 2) return super.getDefaultColor(renderPass, materialID); CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class); - if(mat == null) - mat = TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class); - if(mat == null) - return 0xffffff; + if (mat == null) mat = TConstructRegistry.getCustomMaterial(materialID, FletchlingLeafMaterial.class); + if (mat == null) return 0xffffff; return mat.color; } @@ -116,8 +106,8 @@ protected int getDefaultColor(int renderPass, int materialID) { // fix tooltip custom materials @Override public String getAbilityNameForType(int type, int part) { - if(part >= 2) // only head and handle have ability - return ""; + if (part >= 2) // only head and handle have ability + return ""; return super.getAbilityNameForType(type, part); } } diff --git a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java index a36f6f4a9cd..7545328c542 100644 --- a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java +++ b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java @@ -1,57 +1,50 @@ package tconstruct.weaponry.client; -import tconstruct.library.weaponry.ProjectileWeapon; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; +import tconstruct.library.weaponry.ProjectileWeapon; public class AmmoSlotHandler { @SubscribeEvent - public void onRenderOverlay(RenderGameOverlayEvent.Pre event) - { - if(event.type != RenderGameOverlayEvent.ElementType.HOTBAR) - return; + public void onRenderOverlay(RenderGameOverlayEvent.Pre event) { + if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return; - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().thePlayer; ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null || equipped.getItem() == null) - return; - if(!(equipped.getItem() instanceof ProjectileWeapon)) - return; + if (equipped == null || equipped.getItem() == null) return; + if (!(equipped.getItem() instanceof ProjectileWeapon)) return; // find ammo // todo: cache this somehow? ItemStack ammo = ((ProjectileWeapon) equipped.getItem()).searchForAmmo(player, equipped); - if(ammo == null) - return; + if (ammo == null) return; // check if it's in the inventory int slot = -1; - for(int i = 0; i < 9; i++) - if(player.inventory.mainInventory[i] == ammo) - { + for (int i = 0; i < 9; i++) + if (player.inventory.mainInventory[i] == ammo) { slot = i; break; } // not in the hotbar - if(slot == -1) - return; + if (slot == -1) return; int x = event.resolution.getScaledWidth() / 2 - 90 + slot * 20 + 2; int z = event.resolution.getScaledHeight() - 16 - 3; int col = 0; col |= 120 << 16; // red - col |= 150 << 8; // green - col |= 200 << 0; // blue + col |= 150 << 8; // green + col |= 200 << 0; // blue col |= 200 << 24; // alpha // render a cool underlay thing - Gui.drawRect(x,z, x+16, z+16, col); + Gui.drawRect(x, z, x + 16, z + 16, col); } } diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java index 46062a51bc3..e40d15da56d 100644 --- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java +++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java @@ -1,36 +1,36 @@ package tconstruct.weaponry.client; -import net.minecraft.client.gui.Gui; -import tconstruct.util.Reference; -import tconstruct.library.weaponry.IWindup; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; import org.lwjgl.opengl.GL11; +import tconstruct.library.weaponry.IWindup; +import tconstruct.util.Reference; public class CrosshairHandler { private static Minecraft mc = Minecraft.getMinecraft(); - private static ResourceLocation crossHairSquare = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair.png"); - private static ResourceLocation crossHairTip = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair2.png"); - private static ResourceLocation crossHairWeird = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair3.png"); - private static ResourceLocation crossHairSpike = new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair4.png"); + private static ResourceLocation crossHairSquare = + new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair.png"); + private static ResourceLocation crossHairTip = + new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair2.png"); + private static ResourceLocation crossHairWeird = + new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair3.png"); + private static ResourceLocation crossHairSpike = + new ResourceLocation(Reference.RESOURCE, "textures/gui/Crosshair4.png"); @SubscribeEvent - public void onRenderOverlay(RenderGameOverlayEvent.Pre event) - { - if(event.type != RenderGameOverlayEvent.ElementType.CROSSHAIRS) - return; + public void onRenderOverlay(RenderGameOverlayEvent.Pre event) { + if (event.type != RenderGameOverlayEvent.ElementType.CROSSHAIRS) return; ItemStack equipped = mc.thePlayer.getCurrentEquippedItem(); - if(equipped == null || equipped.getItem() == null) - return; - if(!(equipped.getItem() instanceof IWindup)) - return; + if (equipped == null || equipped.getItem() == null) return; + if (!(equipped.getItem() instanceof IWindup)) return; IWindup weapon = (IWindup) equipped.getItem(); @@ -39,13 +39,24 @@ public void onRenderOverlay(RenderGameOverlayEvent.Pre event) int type = 0; ResourceLocation tex; - switch (weapon.getCrosshairType()) - { - case SQUARE: tex = crossHairSquare; break; - case TIP: tex = crossHairTip; break; - case WEIRD: tex = crossHairWeird; type = 1; break; - case SPIKE: tex = crossHairSpike; type = 1; break; - default: tex = crossHairSquare; type = 0; + switch (weapon.getCrosshairType()) { + case SQUARE: + tex = crossHairSquare; + break; + case TIP: + tex = crossHairTip; + break; + case WEIRD: + tex = crossHairWeird; + type = 1; + break; + case SPIKE: + tex = crossHairSpike; + type = 1; + break; + default: + tex = crossHairSquare; + type = 0; } mc.getTextureManager().bindTexture(tex); @@ -55,7 +66,7 @@ public void onRenderOverlay(RenderGameOverlayEvent.Pre event) float spread = ((1.0f - weapon.getWindupProgress(equipped, mc.thePlayer)) * 25f); // 4 square crosshair - if(type == 0) { + if (type == 0) { drawCrosshairPart(width / 2f - spread, height / 2f - spread, 0); drawCrosshairPart(width / 2f + spread, height / 2f - spread, 1); drawCrosshairPart(width / 2f - spread, height / 2f + spread, 2); @@ -63,10 +74,10 @@ public void onRenderOverlay(RenderGameOverlayEvent.Pre event) } // 4 triangle crosshair else { - drawAlternateCrosshairPart(width/2f, height/2f - spread, 0); - drawAlternateCrosshairPart(width/2f - spread, height/2f, 1); - drawAlternateCrosshairPart(width/2f + spread, height/2f, 2); - drawAlternateCrosshairPart(width/2f, height/2f + spread, 3); + drawAlternateCrosshairPart(width / 2f, height / 2f - spread, 0); + drawAlternateCrosshairPart(width / 2f - spread, height / 2f, 1); + drawAlternateCrosshairPart(width / 2f + spread, height / 2f, 2); + drawAlternateCrosshairPart(width / 2f, height / 2f + spread, 3); } OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); @@ -78,10 +89,9 @@ public void onRenderOverlay(RenderGameOverlayEvent.Pre event) mc.getTextureManager().bindTexture(Gui.icons); } - private void drawCrosshairPart(float width, float height, int part) - { - double w = (double)width; - double h = (double)height; + private void drawCrosshairPart(float width, float height, int part) { + double w = (double) width; + double h = (double) height; double s = 4; double z = -90; @@ -89,9 +99,8 @@ private void drawCrosshairPart(float width, float height, int part) double u1 = 0; double v1 = 0; - switch(part) - { - // top left + switch (part) { + // top left case 0: w -= s; h -= s; @@ -119,17 +128,16 @@ private void drawCrosshairPart(float width, float height, int part) Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(w - s, h - s, z, u1, v1); - tessellator.addVertexWithUV(w - s, h + s, z, u1, v2); - tessellator.addVertexWithUV(w + s, h + s, z, u2, v2); - tessellator.addVertexWithUV(w + s, h - s, z, u2, v1); + tessellator.addVertexWithUV(w - s, h - s, z, u1, v1); + tessellator.addVertexWithUV(w - s, h + s, z, u1, v2); + tessellator.addVertexWithUV(w + s, h + s, z, u2, v2); + tessellator.addVertexWithUV(w + s, h - s, z, u2, v1); tessellator.draw(); } - private void drawAlternateCrosshairPart(float width, float height, int part) - { - double w = (double)width; - double h = (double)height; + private void drawAlternateCrosshairPart(float width, float height, int part) { + double w = (double) width; + double h = (double) height; final double s = 8d; final double z = -90; @@ -137,25 +145,25 @@ private void drawAlternateCrosshairPart(float width, float height, int part) Tessellator tessellator = Tessellator.instance; tessellator.startDrawing(GL11.GL_TRIANGLES); // 4 // top part - if(part == 0) { + if (part == 0) { tessellator.addVertexWithUV(w - s, h - s, z, 0, 0); tessellator.addVertexWithUV(w, h, z, 0.5, 0.5); tessellator.addVertexWithUV(w + s, h - s, z, 1, 0); } // left part - else if(part == 1) { + else if (part == 1) { tessellator.addVertexWithUV(w - s, h - s, z, 0, 0); tessellator.addVertexWithUV(w - s, h + s, z, 0, 1); tessellator.addVertexWithUV(w, h, z, 0.5, 0.5); } // right part - else if(part == 2) { + else if (part == 2) { tessellator.addVertexWithUV(w, h, z, 0.5, 0.5); tessellator.addVertexWithUV(w + s, h + s, z, 1, 1); tessellator.addVertexWithUV(w + s, h - s, z, 1, 0); } // bottom part - else if(part == 3) { + else if (part == 3) { tessellator.addVertexWithUV(w, h, z, 0.5, 0.5); tessellator.addVertexWithUV(w - s, h + s, z, 0, 1); tessellator.addVertexWithUV(w + s, h + s, z, 1, 1); diff --git a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java index 200ab7fa588..bb2a6fb02d9 100644 --- a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java +++ b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java @@ -1,41 +1,36 @@ package tconstruct.weaponry.client; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.library.weaponry.BowBaseAmmo; -import tconstruct.library.weaponry.IWindup; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.FOVUpdateEvent; import net.minecraftforge.client.event.RenderPlayerEvent; +import tconstruct.library.weaponry.BowBaseAmmo; +import tconstruct.library.weaponry.IWindup; +import tconstruct.weaponry.TinkerWeaponry; public class RenderEventHandler { @SubscribeEvent - public void onAimZoom(FOVUpdateEvent event) - { - if(!event.entity.isUsingItem()) - return; + public void onAimZoom(FOVUpdateEvent event) { + if (!event.entity.isUsingItem()) return; - if(!(event.entity.getItemInUse().getItem() instanceof IWindup)) - return; + if (!(event.entity.getItemInUse().getItem() instanceof IWindup)) return; ItemStack weapon = event.entity.getItemInUse(); IWindup item = (IWindup) weapon.getItem(); - if(item.zoomOnWindup(weapon)) - event.newfov = event.fov / (event.fov + (item.getZoom(weapon)-1.0f) * item.getWindupProgress(weapon, event.entity)); + if (item.zoomOnWindup(weapon)) + event.newfov = event.fov + / (event.fov + (item.getZoom(weapon) - 1.0f) * item.getWindupProgress(weapon, event.entity)); } @SubscribeEvent - public void onRenderPlayer(RenderPlayerEvent.Pre event) - { - if(event.entityPlayer.getCurrentEquippedItem() != null && event.entityPlayer.getCurrentEquippedItem().getItem() == TinkerWeaponry.javelin) { - - } + public void onRenderPlayer(RenderPlayerEvent.Pre event) { + if (event.entityPlayer.getCurrentEquippedItem() != null + && event.entityPlayer.getCurrentEquippedItem().getItem() == TinkerWeaponry.javelin) {} - if(event.entityPlayer.getItemInUse() == null) - return; + if (event.entityPlayer.getItemInUse() == null) return; - if(event.entityPlayer.getItemInUse().getItem() instanceof BowBaseAmmo) { + if (event.entityPlayer.getItemInUse().getItem() instanceof BowBaseAmmo) { event.renderer.modelBipedMain.aimedBow = true; event.renderer.modelArmor.aimedBow = true; event.renderer.modelArmorChestplate.aimedBow = true; diff --git a/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java index 066675d789d..2bc7bfe385c 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ArrowEntityRenderer.java @@ -1,7 +1,7 @@ package tconstruct.weaponry.client.entity; -import tconstruct.weaponry.entity.ArrowEntity; import org.lwjgl.opengl.GL11; +import tconstruct.weaponry.entity.ArrowEntity; public class ArrowEntityRenderer extends ProjectileBaseRenderer { private int count = 0; @@ -34,8 +34,7 @@ public void customRendering(ArrowEntity entity, double x, double y, double z, fl GL11.glRotatef(-entity.rotationPitch, 1f, 0f, 0f); // rotate it so it's "upright" - if(count == 0) - GL11.glRotatef(90, 0f, 0f, 1f); + if (count == 0) GL11.glRotatef(90, 0f, 0f, 1f); GL11.glRotatef(45, 0f, 0f, 1f); @@ -46,6 +45,6 @@ public void customRendering(ArrowEntity entity, double x, double y, double z, fl GL11.glRotatef(-45, 0f, 0f, 1f); // thinner arrows - toolCoreRenderer.setDepth(1/64f); + toolCoreRenderer.setDepth(1 / 64f); } } diff --git a/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java index 796e4a0f297..1269cc48aa3 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/JavelinEntityRenderer.java @@ -1,11 +1,12 @@ package tconstruct.weaponry.client.entity; -import tconstruct.weaponry.entity.JavelinEntity; import org.lwjgl.opengl.GL11; +import tconstruct.weaponry.entity.JavelinEntity; public class JavelinEntityRenderer extends ProjectileBaseRenderer { @Override - public void customRendering(JavelinEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + public void customRendering( + JavelinEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { // rotate it into the direction we threw it GL11.glRotatef(entity.rotationYaw, 0f, 1f, 0f); @@ -24,6 +25,6 @@ public void customRendering(JavelinEntity entity, double x, double y, double z, // rotate the projectile it so it faces upwards (because the graphic itself is rotated by 45°) GL11.glRotatef(45, 0f, 0f, 1f); - toolCoreRenderer.setDepth(1/16f); + toolCoreRenderer.setDepth(1 / 16f); } } diff --git a/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java index 69f4664d084..9012f92cf02 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java @@ -1,7 +1,5 @@ package tconstruct.weaponry.client.entity; -import tconstruct.client.FlexibleToolRenderer; -import tconstruct.library.entity.ProjectileBase; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -10,14 +8,22 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import tconstruct.client.FlexibleToolRenderer; +import tconstruct.library.entity.ProjectileBase; public class ProjectileBaseRenderer extends Render { protected static FlexibleToolRenderer toolCoreRenderer = new FlexibleToolRenderer(); @SuppressWarnings("unchecked") @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - doRender((T)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); + public void doRender( + Entity p_76986_1_, + double p_76986_2_, + double p_76986_4_, + double p_76986_6_, + float p_76986_8_, + float p_76986_9_) { + doRender((T) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); } public void doRender(T entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { @@ -27,7 +33,7 @@ public void doRender(T entity, double x, double y, double z, float p_76986_8_, f // So remember to read this from the rendering call up to this line // can be overwritten in customRendering - toolCoreRenderer.setDepth(1/32f); + toolCoreRenderer.setDepth(1 / 32f); GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -40,15 +46,13 @@ public void doRender(T entity, double x, double y, double z, float p_76986_8_, f customRendering(entity, x, y, z, p_76986_8_, p_76986_9_); // arrow shake - float f11 = (float)entity.arrowShake - p_76986_9_; - if (f11 > 0.0F) - { + float f11 = (float) entity.arrowShake - p_76986_9_; + if (f11 > 0.0F) { float f12 = -MathHelper.sin(f11 * 3.0F) * f11; GL11.glRotatef(f12, 0.0F, 0.0F, 1.0F); } - if(renderManager == null || renderManager.renderEngine == null) - return; + if (renderManager == null || renderManager.renderEngine == null) return; // draw correct texture. not some weird block fragments. renderManager.renderEngine.bindTexture(TextureMap.locationItemsTexture); @@ -61,8 +65,7 @@ public void doRender(T entity, double x, double y, double z, float p_76986_8_, f GL11.glPopMatrix(); } - public void customRendering(T entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) - { + public void customRendering(T entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { // flip it, flop it, pop it, pull it, push it, rotate it, translate it, TECHNOLOGY // rotate it into the direction we threw it @@ -80,13 +83,12 @@ public void customRendering(T entity, double x, double y, double z, float p_7698 } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return this.func_110796_a((ProjectileBase) par1Entity); } - protected ResourceLocation func_110796_a (ProjectileBase par1ArrowEntity) - { - return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber()); + protected ResourceLocation func_110796_a(ProjectileBase par1ArrowEntity) { + return this.renderManager.renderEngine.getResourceLocation( + par1ArrowEntity.getEntityItem().getItemSpriteNumber()); } } diff --git a/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java index ff6ed7c4c52..82683edb9b7 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ShurikenEntityRenderer.java @@ -1,12 +1,13 @@ package tconstruct.weaponry.client.entity; -import tconstruct.weaponry.entity.ShurikenEntity; import org.lwjgl.opengl.GL11; +import tconstruct.weaponry.entity.ShurikenEntity; public class ShurikenEntityRenderer extends ProjectileBaseRenderer { @Override - public void customRendering(ShurikenEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + public void customRendering( + ShurikenEntity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { // make it smaller GL11.glScalef(0.6F, 0.6F, 0.6F); @@ -23,8 +24,7 @@ public void customRendering(ShurikenEntity entity, double x, double y, double z, // shurikens spin around their center a lot. *spin* GL11.glRotatef(entity.spin, 0f, 0f, 1f); - // also make it a bit thicker - toolCoreRenderer.setDepth(1/20f); + toolCoreRenderer.setDepth(1 / 20f); } } diff --git a/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java b/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java index 565ef16266a..030700cccb7 100644 --- a/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java @@ -1,11 +1,5 @@ package tconstruct.weaponry.client.item; -import tconstruct.client.FlexibleToolRenderer; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.ammo.ArrowAmmo; -import tconstruct.weaponry.entity.ArrowEntity; -import tconstruct.library.weaponry.ProjectileWeapon; -import tconstruct.library.weaponry.IWindup; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; @@ -13,7 +7,12 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import tconstruct.weaponry.entity.BoltEntity; +import tconstruct.client.FlexibleToolRenderer; +import tconstruct.library.weaponry.IWindup; +import tconstruct.library.weaponry.ProjectileWeapon; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.ammo.ArrowAmmo; +import tconstruct.weaponry.entity.ArrowEntity; public class BowRenderer extends FlexibleToolRenderer { private static final ArrowEntity dummy = new ArrowEntity(null); @@ -25,41 +24,35 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { GL11.glTranslatef(0.5f, 0.5f, 0); GL11.glScalef(0.5f, 0.5f, 0.5f); - if(type == ItemRenderType.EQUIPPED) - { - //GL11.glTranslatef(0.0F, 0.125F, 0.3125F); + if (type == ItemRenderType.EQUIPPED) { + // GL11.glTranslatef(0.0F, 0.125F, 0.3125F); GL11.glTranslatef(0.2F, -0.4F, 0.2f); GL11.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); - //GL11.glScalef(f1, -f1, f1); - //GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + // GL11.glScalef(f1, -f1, f1); + // GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } // windup animation - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON && player.isUsingItem()) - { + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON && player.isUsingItem()) { float progress = ((IWindup) item.getItem()).getWindupProgress(item, player); - //GL11.glScalef(1.2f, 1.2f, 1.2f); - //float progress = ((IWindup) item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer);; + // GL11.glScalef(1.2f, 1.2f, 1.2f); + // float progress = ((IWindup) item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer);; GL11.glRotatef(-18.0F, 0.0F, 0.0F, 1.0F); // tilts the bow forward a bit GL11.glRotatef(-6.0F, 0.0F, 1.0F, 0.0F); // rotates the bow so it faces more forward GL11.glRotatef(8.0F, 1.0F, 0.0F, 0.0F); // rotates the bow forward GL11.glTranslatef(-0.9F, 0.2F, -1.0F); - // this does the "zoom closer to the bow" thing GL11.glTranslatef(progress * -0.1f, progress * -0.125f, 0.0F); - - // we're crazy, so.. render the arrow =D - ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! - if(ammo != null) { - if(ammo.getItem() == Items.arrow) - dummy.returnStack = ArrowAmmo.vanillaArrow; - else - dummy.returnStack = ammo; + ItemStack ammo = ((ProjectileWeapon) item.getItem()) + .searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! + if (ammo != null) { + if (ammo.getItem() == Items.arrow) dummy.returnStack = ArrowAmmo.vanillaArrow; + else dummy.returnStack = ammo; Render renderer = RenderManager.instance.getEntityClassRenderObject(ArrowEntity.class); GL11.glPushMatrix(); @@ -79,16 +72,14 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { renderer.doRender(dummy, 0, 0, 0, 0, 0); GL11.glPopMatrix(); } - } - else if(type == ItemRenderType.EQUIPPED && player.isUsingItem()) - { + } else if (type == ItemRenderType.EQUIPPED && player.isUsingItem()) { // we're crazy, so.. render the arrow =D - ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! - if(ammo != null) { - if(ammo.getItem() == Items.arrow || !(ammo.getItem() instanceof ArrowAmmo)) + ItemStack ammo = ((ProjectileWeapon) item.getItem()) + .searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! + if (ammo != null) { + if (ammo.getItem() == Items.arrow || !(ammo.getItem() instanceof ArrowAmmo)) dummy.returnStack = ArrowAmmo.vanillaArrow; - else - dummy.returnStack = ammo; + else dummy.returnStack = ammo; Render renderer = RenderManager.instance.getEntityClassRenderObject(ArrowEntity.class); GL11.glPushMatrix(); @@ -110,11 +101,8 @@ else if(type == ItemRenderType.EQUIPPED && player.isUsingItem()) } } - - if(item.getItem() == TinkerWeaponry.longbow) - GL11.glScalef(2.3f, 2.3f, 1.0f); - else if(item.getItem() == TinkerWeaponry.shortbow) - GL11.glScalef(1.7f, 1.7f, 1.0f); + if (item.getItem() == TinkerWeaponry.longbow) GL11.glScalef(2.3f, 2.3f, 1.0f); + else if (item.getItem() == TinkerWeaponry.shortbow) GL11.glScalef(1.7f, 1.7f, 1.0f); GL11.glTranslatef(-0.5f, -0.5f, 0f); } diff --git a/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java b/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java index 469617174f3..9f02832a883 100644 --- a/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java @@ -1,17 +1,16 @@ package tconstruct.weaponry.client.item; -import tconstruct.client.FlexibleToolRenderer; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.ammo.BoltAmmo; -import tconstruct.weaponry.entity.ArrowEntity; -import tconstruct.weaponry.entity.BoltEntity; -import tconstruct.weaponry.weapons.Crossbow; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import tconstruct.client.FlexibleToolRenderer; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.ammo.BoltAmmo; +import tconstruct.weaponry.entity.BoltEntity; +import tconstruct.weaponry.weapons.Crossbow; public class CrossbowRenderer extends FlexibleToolRenderer { private static final BoltEntity dummy = new BoltEntity(null); @@ -19,44 +18,41 @@ public class CrossbowRenderer extends FlexibleToolRenderer { @Override protected void specialAnimation(ItemRenderType type, ItemStack item) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - Crossbow crossbow = (Crossbow)item.getItem(); + Crossbow crossbow = (Crossbow) item.getItem(); GL11.glTranslatef(0.5f, 0.5f, 0); GL11.glScalef(0.5f, 0.5f, 0.5f); GL11.glScalef(1.5f, 1.5f, 1.5f); - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { // we're crazy, so.. render the arrow =D ItemStack ammo = crossbow.getLoadedAmmo(item); - if(crossbow.isLoaded(item)) - { + if (crossbow.isLoaded(item)) { GL11.glTranslatef(0.0f, 0.0f, -0.3f); GL11.glRotatef(80f, 1f, 0f, 0f); GL11.glRotatef(15f, 0f, 1f, 0f); GL11.glRotatef(-20, 0, 0, 1); - } - else { + } else { GL11.glScalef(1.1f, 1.1f, 1.1f); GL11.glTranslatef(0.1f, 0f, 0f); GL11.glRotatef(50f, 1f, 0f, 0f); } - if(ammo != null && ammo.hasTagCompound()) { - //float progress = crossbow.getWindupProgress(item, player); + if (ammo != null && ammo.hasTagCompound()) { + // float progress = crossbow.getWindupProgress(item, player); float progress = 1f; dummy.returnStack = ammo; - if(!(ammo.getItem() instanceof BoltAmmo)) - dummy.returnStack = TinkerWeaponry.creativeBolt; + if (!(ammo.getItem() instanceof BoltAmmo)) dummy.returnStack = TinkerWeaponry.creativeBolt; Render renderer = RenderManager.instance.getEntityClassRenderObject(BoltEntity.class); GL11.glPushMatrix(); // adjust position - //GL11.glScalef(2, 2, 2); // bigger + // GL11.glScalef(2, 2, 2); // bigger GL11.glRotatef(95, 0, 1, 0); // rotate it into the same direction as the bow - //GL11.glRotatef(15, 0, 1, 0); // rotate it a bit more so it's not directly inside the bow + // GL11.glRotatef(15, 0, 1, 0); // rotate it a bit more so it's not directly inside the bow GL11.glRotatef(-45, 1, 0, 0); // sprite is rotated by 45° in the graphics, correct that GL11.glTranslatef(0.05f, 0, 0); // same as the not-inside-bow-rotation @@ -71,9 +67,7 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { } } - - if(type == ItemRenderType.EQUIPPED) - { + if (type == ItemRenderType.EQUIPPED) { GL11.glTranslatef(0.25f, 0, 0); GL11.glRotatef(45.0F, 0.0F, 0.0F, 1.0F); } diff --git a/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java b/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java index 4731d528deb..7b3905e136c 100644 --- a/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/JavelinRenderer.java @@ -1,10 +1,10 @@ package tconstruct.weaponry.client.item; -import tconstruct.client.AmmoItemRenderer; -import tconstruct.library.weaponry.IWindup; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import tconstruct.client.AmmoItemRenderer; +import tconstruct.library.weaponry.IWindup; public class JavelinRenderer extends AmmoItemRenderer { @@ -13,16 +13,15 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { GL11.glTranslatef(0.5f, 0.5f, 0); GL11.glScalef(0.5f, 0.5f, 0.5f); - float progress = ((IWindup)item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 while not winding + float progress = ((IWindup) item.getItem()) + .getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 while not winding - if(type == ItemRenderType.EQUIPPED) - GL11.glRotatef(90, 0, 0, 1); + if (type == ItemRenderType.EQUIPPED) GL11.glRotatef(90, 0, 0, 1); GL11.glRotatef(-45, 0, 0, 1); GL11.glScalef(1.5F, 2F, 1.5F); - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) - GL11.glTranslatef(0, progress * 0.4f, 0); + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) GL11.glTranslatef(0, progress * 0.4f, 0); GL11.glRotatef(45, 0, 0, 1); GL11.glTranslatef(-0.5f, -0.5f, 0f); diff --git a/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java b/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java index 9fad436c099..ba16f2d901a 100644 --- a/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/ThrowingKnifeRenderer.java @@ -1,7 +1,5 @@ package tconstruct.weaponry.client.item; -import tconstruct.client.AmmoItemRenderer; -import tconstruct.library.weaponry.IWindup; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; @@ -9,6 +7,8 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import tconstruct.client.AmmoItemRenderer; +import tconstruct.library.weaponry.IWindup; public class ThrowingKnifeRenderer extends AmmoItemRenderer { private static Minecraft mc = Minecraft.getMinecraft(); @@ -18,15 +18,15 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { GL11.glTranslatef(0.5f, 0.5f, 0); GL11.glScalef(0.5f, 0.5f, 0.5f); - float progress = ((IWindup)item.getItem()).getWindupProgress(item, mc.thePlayer); + float progress = ((IWindup) item.getItem()).getWindupProgress(item, mc.thePlayer); - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { GL11.glPushMatrix(); GL11.glScalef(2.5f, 2.5f, 2.5f); // rotate it, otherwise it's drawn over our item :( GL11.glTranslatef(0.5f, -0.6f, 0f); - //GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - //GL11.glRotatef(-85.0F, 0.0F, 0.0F, 1.0F); + // GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + // GL11.glRotatef(-85.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F); @@ -41,22 +41,21 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); // rotate it aroooound - //GL11.glRotatef(-180, 0, 0, 1); - //GL11.glTranslatef(0.5f, -0.6f, 0f); - //GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F); + // GL11.glRotatef(-180, 0, 0, 1); + // GL11.glTranslatef(0.5f, -0.6f, 0f); + // GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(1.3f, 0.4f, -0.2f); - //GL11.glTranslatef(-0.5f, 0.6f, 0f); - //GL11.glTranslatef(0.f, 1f, 0f); - //GL11.glTranslatef(progress * -1.5f, 0.0f, 0f); + // GL11.glTranslatef(-0.5f, 0.6f, 0f); + // GL11.glTranslatef(0.f, 1f, 0f); + // GL11.glTranslatef(progress * -1.5f, 0.0f, 0f); GL11.glTranslatef(0.0f, -1.85f, 0f); GL11.glRotatef(progress * 35.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.0f, 1.85f, 0f); GL11.glRotatef(progress * -15.0F, 0.0F, 0.0F, 1.0F); - //GL11.glTranslatef(-0.f, -1f, 0f); - //GL11.glTranslatef(0.5f, -0.6f, 0f); - + // GL11.glTranslatef(-0.f, -1f, 0f); + // GL11.glTranslatef(0.5f, -0.6f, 0f); GL11.glScalef(1.5f, 1.5f, 1.5f); @@ -65,9 +64,7 @@ protected void specialAnimation(ItemRenderType type, ItemStack item) { GL11.glRotatef(-25.0F, 0.0F, 0.0F, 1.0F); } - if(type == ItemRenderType.EQUIPPED) - GL11.glRotatef(-180, 0, 0, 1); - + if (type == ItemRenderType.EQUIPPED) GL11.glRotatef(-180, 0, 0, 1); GL11.glTranslatef(-0.5f, -0.5f, 0f); } diff --git a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java index 82ed65c1f89..e7dd8ccc273 100644 --- a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java @@ -1,7 +1,5 @@ package tconstruct.weaponry.entity; -import tconstruct.library.entity.ProjectileBase; -import tconstruct.library.util.PiercingArrowDamage; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -10,7 +8,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import tconstruct.TConstruct; +import tconstruct.library.entity.ProjectileBase; import tconstruct.library.tools.ToolCore; +import tconstruct.library.util.PiercingArrowDamage; public class ArrowEntity extends ProjectileBase { public ArrowEntity(World world) { @@ -33,17 +33,18 @@ protected double getStuckDepth() { @Override protected double getSlowdown() { // we could use the fletchling material for the slowdown, hm - // note: not done because fletchlings also balance amount you get now. Rather use slowdown for different projectile types + // note: not done because fletchlings also balance amount you get now. Rather use slowdown for different + // projectile types return super.getSlowdown(); } @Override protected double getGravity() { - if(returnStack == null || !returnStack.hasTagCompound()) - return super.getGravity(); + if (returnStack == null || !returnStack.hasTagCompound()) return super.getGravity(); float mass = returnStack.getTagCompound().getCompoundTag("InfiTool").getFloat("Mass"); - mass /= 36f; // why 36? simple because it's roughly 0.05 with flint head and wooden arrow shaft! Yes, that's the only reason. + mass /= 36f; // why 36? simple because it's roughly 0.05 with flint head and wooden arrow shaft! Yes, that's the + // only reason. return mass; } @@ -51,15 +52,13 @@ protected double getGravity() { public void onHitBlock(MovingObjectPosition movingobjectposition) { super.onHitBlock(movingobjectposition); - if(defused) - return; + if (defused) return; - if(returnStack == null || !returnStack.hasTagCompound()) - return; + if (returnStack == null || !returnStack.hasTagCompound()) return; // we might break! oh noez! float chance = returnStack.getTagCompound().getCompoundTag("InfiTool").getFloat("BreakChance"); - if(chance > TConstruct.random.nextFloat()) { + if (chance > TConstruct.random.nextFloat()) { this.setDead(); this.playSound("random.break", 1.0F, 1.5F / (this.rand.nextFloat() * 0.2F + 0.9F)); } @@ -77,42 +76,40 @@ protected void playHitEntitySound() { // returns true if it was successful @Override - public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Entity entityHit) - { + public boolean dealDamage(float damage, ToolCore ammo, NBTTagCompound tags, Entity entityHit) { boolean dealtDamage = false; - //Minecraft.getMinecraft().thePlayer.sendChatMessage("Damage/Weight: " + damage + " - " + tags.getFloat("Mass")); + // Minecraft.getMinecraft().thePlayer.sendChatMessage("Damage/Weight: " + damage + " - " + + // tags.getFloat("Mass")); // we take the weight, and shift the damage done towards armor piercing, the more weight the arrow/bolt has! - float shift = (tags.getFloat("Mass") - 0.7f)*armorPenetrationModifier(); + float shift = (tags.getFloat("Mass") - 0.7f) * armorPenetrationModifier(); - if(shift < 0) - shift = 0; - if(shift > damage) - shift = damage; + if (shift < 0) shift = 0; + if (shift > damage) shift = damage; damage -= shift; // deal regular damage - if(damage > 0) - dealtDamage = super.dealDamage(damage, ammo, tags, entityHit); + if (damage > 0) dealtDamage = super.dealDamage(damage, ammo, tags, entityHit); // deal armor piercing damage - if(shift > 0) { + if (shift > 0) { DamageSource damagesource; - if (this.shootingEntity == null) - damagesource = new PiercingArrowDamage("arrow", this, this); - else - damagesource = new PiercingArrowDamage("arrow", this, this.shootingEntity); + if (this.shootingEntity == null) damagesource = new PiercingArrowDamage("arrow", this, this); + else damagesource = new PiercingArrowDamage("arrow", this, this.shootingEntity); - //Minecraft.getMinecraft().thePlayer.sendChatMessage("Piercing Damage: " + shift); + // Minecraft.getMinecraft().thePlayer.sendChatMessage("Piercing Damage: " + shift); - // piercing damage does not affect wether the entity was hit (return value), since it should go through always + // piercing damage does not affect wether the entity was hit (return value), since it should go through + // always entityHit.attackEntityFrom(damagesource, shift); } return dealtDamage; } - protected float armorPenetrationModifier() { return 1.0f; } + protected float armorPenetrationModifier() { + return 1.0f; + } } diff --git a/src/main/java/tconstruct/weaponry/entity/BoltEntity.java b/src/main/java/tconstruct/weaponry/entity/BoltEntity.java index f75a6e92c33..d8223a79de8 100644 --- a/src/main/java/tconstruct/weaponry/entity/BoltEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/BoltEntity.java @@ -22,8 +22,7 @@ public BoltEntity(World world, EntityPlayer player, float speed, float accuracy, @Override protected void updateInAir() { - if(this.ticksInAir > 1) - this.setIsCritical(true); + if (this.ticksInAir > 1) this.setIsCritical(true); super.updateInAir(); } diff --git a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java index 81a96c78367..aa43fc92cc0 100644 --- a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java @@ -1,11 +1,11 @@ package tconstruct.weaponry.entity; -import tconstruct.library.entity.ProjectileBase; -import tconstruct.weaponry.TinkerWeaponry; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.library.entity.ProjectileBase; +import tconstruct.weaponry.TinkerWeaponry; public class JavelinEntity extends ProjectileBase { public int roll = 0; @@ -25,8 +25,7 @@ public JavelinEntity(World world, EntityPlayer player, float speed, float accura @Override public void onUpdate() { // you turn me right round baby - if(this.ticksInGround == 0) - roll = (roll + 13) % 360; + if (this.ticksInGround == 0) roll = (roll + 13) % 360; super.onUpdate(); } @@ -39,7 +38,9 @@ public void readSpawnData(ByteBuf data) { roll = TinkerWeaponry.random.nextInt(360); } - protected double getGravity() { return 0.07; } + protected double getGravity() { + return 0.07; + } @Override protected double getStuckDepth() { diff --git a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java index e242e9248eb..97c1d6d46d0 100644 --- a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java @@ -1,11 +1,11 @@ package tconstruct.weaponry.entity; -import tconstruct.library.entity.ProjectileBase; -import tconstruct.weaponry.TinkerWeaponry; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.library.entity.ProjectileBase; +import tconstruct.weaponry.TinkerWeaponry; public class ShurikenEntity extends ProjectileBase { public int spin = 0; @@ -32,8 +32,7 @@ public ShurikenEntity(World world, EntityPlayer player, float speed, float accur @Override public void onUpdate() { // you turn me right round baby - if(this.ticksInGround == 0) - spin = (spin + 33) % 360; + if (this.ticksInGround == 0) spin = (spin + 33) % 360; super.onUpdate(); } @@ -43,13 +42,14 @@ public void readSpawnData(ByteBuf data) { super.readSpawnData(data); // this is only relevant clientside only, so we don't actually have it on the server - //rollAngle = (TinkerWeaponry.random.nextInt(3)-1)*45 + TinkerWeaponry.random.nextInt(30)-15; + // rollAngle = (TinkerWeaponry.random.nextInt(3)-1)*45 + TinkerWeaponry.random.nextInt(30)-15; spin = TinkerWeaponry.random.nextInt(360); } @Override protected double getGravity() { - return (this.ticksExisted/8) * 0.018d; // integer division. so the first 20 ticks it will have no gravity at all. + return (this.ticksExisted / 8) + * 0.018d; // integer division. so the first 20 ticks it will have no gravity at all. } @Override diff --git a/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java b/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java index e0768e0c76f..f37bc822679 100644 --- a/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java @@ -1,10 +1,10 @@ package tconstruct.weaponry.entity; -import tconstruct.library.entity.ProjectileBase; -import tconstruct.weaponry.TinkerWeaponry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.library.entity.ProjectileBase; +import tconstruct.weaponry.TinkerWeaponry; public class ThrowingKnifeEntity extends ProjectileBase { public ThrowingKnifeEntity(World world) { diff --git a/src/main/java/tconstruct/weaponry/items/Boneana.java b/src/main/java/tconstruct/weaponry/items/Boneana.java index ae8f4aa3cc4..8402c31e945 100644 --- a/src/main/java/tconstruct/weaponry/items/Boneana.java +++ b/src/main/java/tconstruct/weaponry/items/Boneana.java @@ -2,17 +2,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import tconstruct.items.tools.Broadsword; -import tconstruct.library.tools.AbilityHelper; import tconstruct.util.Reference; -import java.util.List; - public class Boneana extends Broadsword { private IIcon brokenIcon; @@ -25,11 +23,9 @@ public void registerIcons(IIconRegister iconRegister) { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass) { - if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) - return emptyIcon; + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) return emptyIcon; - if(stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) - return brokenIcon; + if (stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) return brokenIcon; return itemIcon; } diff --git a/src/main/java/tconstruct/weaponry/items/GlassArrows.java b/src/main/java/tconstruct/weaponry/items/GlassArrows.java index c5146792ca0..0a78ff4b82e 100644 --- a/src/main/java/tconstruct/weaponry/items/GlassArrows.java +++ b/src/main/java/tconstruct/weaponry/items/GlassArrows.java @@ -1,23 +1,17 @@ package tconstruct.weaponry.items; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.util.Reference; -import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.ArrowAmmo; -import java.util.List; - public class GlassArrows extends ArrowAmmo { public GlassArrows() { super(); @@ -35,13 +29,11 @@ public void getSubItems(Item id, CreativeTabs tab, List list) { ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // wooden shaft ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling - ItemStack tool = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, null, this.getLocalizedToolName()); - if (tool != null) - { + ItemStack tool = ToolBuilder.instance.buildTool( + headStack, handleStack, accessoryStack, null, this.getLocalizedToolName()); + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); - } - else - return; + } else return; // now turn it into legendary glass arrows! NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java b/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java index 9de1b572adc..9028ba81dcc 100644 --- a/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java +++ b/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java @@ -1,15 +1,14 @@ package tconstruct.weaponry.items; -import tconstruct.util.Reference; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.tools.items.Pattern; - -import java.util.List; +import tconstruct.util.Reference; public class WeaponryPattern extends Pattern { - private static final String[] patternName = new String[] { "shuriken", "crossbowlimb", "crossbowbody", "bowlimb" }; + private static final String[] patternName = new String[] {"shuriken", "crossbowlimb", "crossbowbody", "bowlimb"}; public WeaponryPattern(String patternType, String name) { super(patternName, getPatternNames(patternName, patternType), "patterns/"); @@ -17,19 +16,15 @@ public WeaponryPattern(String patternType, String name) { this.setUnlocalizedName(Reference.prefix(name)); } - public static String[] getPatternNames (String[] patternName, String partType) - { + public static String[] getPatternNames(String[] patternName, String partType) { String[] names = new String[patternName.length]; - for (int i = 0; i < patternName.length; i++) - names[i] = partType + patternName[i]; + for (int i = 0; i < patternName.length; i++) names[i] = partType + patternName[i]; return names; } @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 0; i < patternName.length; i++) - { + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 0; i < patternName.length; i++) { // if (i != 23) list.add(new ItemStack(b, 1, i)); } @@ -37,12 +32,15 @@ public void getSubItems (Item b, CreativeTabs tab, List list) @Override public int getPatternCost(ItemStack pattern) { - switch(pattern.getItemDamage()) - { - case 0: return 1; // shuriken - case 1: return 8; // crossbow limb - case 2: return 10; // crossbow body - case 3: return 3; // bowlimb + switch (pattern.getItemDamage()) { + case 0: + return 1; // shuriken + case 1: + return 8; // crossbow limb + case 2: + return 10; // crossbow body + case 3: + return 3; // bowlimb } return 0; } diff --git a/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java b/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java index 36df06710f7..877542af3e3 100644 --- a/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java +++ b/src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java @@ -1,15 +1,14 @@ package tconstruct.weaponry.items; -import tconstruct.util.Reference; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.tools.items.Pattern; - -import java.util.List; +import tconstruct.util.Reference; public class WeaponryPatternClay extends Pattern { - private static final String[] patternName = new String[] { "", "", "", "bowlimb" }; + private static final String[] patternName = new String[] {"", "", "", "bowlimb"}; public WeaponryPatternClay(String patternType, String name) { super(patternName, getPatternNames(patternName, patternType), "patterns/"); @@ -17,37 +16,33 @@ public WeaponryPatternClay(String patternType, String name) { this.setUnlocalizedName(Reference.prefix(name)); } - public static String[] getPatternNames (String[] patternName, String partType) - { + public static String[] getPatternNames(String[] patternName, String partType) { String[] names = new String[patternName.length]; for (int i = 0; i < patternName.length; i++) - if (!(patternName[i].equals(""))) - names[i] = partType + patternName[i]; - else - names[i] = ""; + if (!(patternName[i].equals(""))) names[i] = partType + patternName[i]; + else names[i] = ""; return names; } @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 0; i < patternName.length; i++) - { + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 0; i < patternName.length; i++) { // if (i != 23) - if (!(patternName[i].equals(""))) - list.add(new ItemStack(b, 1, i)); + if (!(patternName[i].equals(""))) list.add(new ItemStack(b, 1, i)); } } - @Override public int getPatternCost(ItemStack pattern) { - switch(pattern.getItemDamage()) - { - case 0: return 1; // shuriken - case 1: return 8; // crossbow limb - case 2: return 10; // crossbow body - case 3: return 3; // bowlimb + switch (pattern.getItemDamage()) { + case 0: + return 1; // shuriken + case 1: + return 8; // crossbow limb + case 2: + return 10; // crossbow body + case 3: + return 3; // bowlimb } return 0; } diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 28994a4d01a..190a3d5a5d3 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -1,17 +1,8 @@ package tconstruct.weaponry.weapons; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.init.Items; -import tconstruct.TConstruct; -import tconstruct.library.TConstructRegistry; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.ammo.BoltAmmo; -import tconstruct.weaponry.entity.BoltEntity; -import tconstruct.library.weaponry.AmmoItem; -import tconstruct.library.weaponry.ProjectileWeapon; -import tconstruct.util.Reference; -import tconstruct.library.weaponry.IAmmo; +import cpw.mods.fml.common.Loader; +import java.util.List; +import mods.battlegear2.api.core.InventoryPlayerBattle; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; @@ -20,13 +11,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.weaponry.AmmoItem; +import tconstruct.library.weaponry.IAmmo; +import tconstruct.library.weaponry.ProjectileWeapon; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.Loader; -import mods.battlegear2.api.core.InventoryPlayerBattle; - -import java.util.List; +import tconstruct.util.Reference; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.ammo.BoltAmmo; +import tconstruct.weaponry.entity.BoltEntity; public class Crossbow extends ProjectileWeapon { public Crossbow() { @@ -34,29 +29,25 @@ public Crossbow() { this.setMaxDamage(100); } - public boolean isLoaded(ItemStack itemStack) - { - if(itemStack.hasTagCompound()) + public boolean isLoaded(ItemStack itemStack) { + if (itemStack.hasTagCompound()) return isLoaded(itemStack.getTagCompound().getCompoundTag("InfiTool")); return false; } - public boolean isLoaded(NBTTagCompound tags) - { + public boolean isLoaded(NBTTagCompound tags) { return tags.getBoolean("Loaded"); } - public ItemStack getLoadedAmmo(ItemStack itemStack) - { + public ItemStack getLoadedAmmo(ItemStack itemStack) { NBTTagCompound tags = itemStack.getTagCompound().getCompoundTag("InfiTool"); - if(!isLoaded(tags)) - return null; + if (!isLoaded(tags)) return null; ItemStack ammo = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("LoadedItem")); // prevent crashes from remapping corruptions.. - if(ammo != null && ammo.getItem() != null && ammo.getItem() != TinkerWeaponry.boltAmmo) { + if (ammo != null && ammo.getItem() != null && ammo.getItem() != TinkerWeaponry.boltAmmo) { tags.removeTag("LoadedItem"); ammo = null; } @@ -74,13 +65,10 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); // unload on shift-rightclick - if(player.isSneaking()) - if(unload(stack, player, tags)) - return stack; + if (player.isSneaking()) if (unload(stack, player, tags)) return stack; // loaded - if(tags.getBoolean("Loaded")) - fire(stack, world, player); + if (tags.getBoolean("Loaded")) fire(stack, world, player); // reload (automatically after firing) initiateReload(stack, player, tags); @@ -92,23 +80,18 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if(!stack.hasTagCompound()) - return; + if (!stack.hasTagCompound()) return; - if(!(entity instanceof EntityPlayer)) - return; + if (!(entity instanceof EntityPlayer)) return; EntityPlayer player = (EntityPlayer) entity; - if(player.inventory.getCurrentItem() != stack) - return; + if (player.inventory.getCurrentItem() != stack) return; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if(tags.hasKey("Reloading")) - { + if (tags.hasKey("Reloading")) { int timeLeft = tags.getInteger("Reloading"); timeLeft--; - if(timeLeft > 0) - tags.setInteger("Reloading", timeLeft); + if (timeLeft > 0) tags.setInteger("Reloading", timeLeft); else { tags.removeTag("Reloading"); reload(stack, player, world, tags); @@ -121,58 +104,49 @@ public float getWindupProgress(ItemStack itemStack, EntityPlayer player) { NBTTagCompound tags = itemStack.getTagCompound().getCompoundTag("InfiTool"); // loaded, full accuracy - if(tags.getBoolean("Loaded")) - return 1.0f; + if (tags.getBoolean("Loaded")) return 1.0f; // not loaded, but reloading -> progress - else if(tags.hasKey("Reloading")) - return 1.0f - ((float)tags.getInteger("Reloading"))/((float)getWindupTime(itemStack)); + else if (tags.hasKey("Reloading")) + return 1.0f - ((float) tags.getInteger("Reloading")) / ((float) getWindupTime(itemStack)); // not loaded and not reloading -> no accuracy! - else - return 0.0f; + else return 0.0f; } public void initiateReload(ItemStack stack, EntityPlayer player, NBTTagCompound tags) { - if(tags.getBoolean("Broken")) - return; + if (tags.getBoolean("Broken")) return; // has ammo? - if(searchForAmmo(player, stack) != null) - if(!tags.hasKey("Reloading")) + if (searchForAmmo(player, stack) != null) + if (!tags.hasKey("Reloading")) // start reloading tags.setInteger("Reloading", getWindupTime(stack)); } // called after the reloading is done. Does the actual loading - public boolean reload(ItemStack weapon, EntityPlayer player, World world, NBTTagCompound tags) - { + public boolean reload(ItemStack weapon, EntityPlayer player, World world, NBTTagCompound tags) { ItemStack ammo = searchForAmmo(player, weapon); // no ammo present - if(ammo == null) - return false; + if (ammo == null) return false; // already loaded - if(tags.getBoolean("Loaded")) - return false; + if (tags.getBoolean("Loaded")) return false; ItemStack copy = ammo.copy(); copy.getTagCompound().getCompoundTag("InfiTool").setInteger("Ammo", 1); - // load ammo into nbt NBTTagCompound ammotag = new NBTTagCompound(); copy.writeToNBT(ammotag); - //ammotag.getCompoundTag("tag"; // set ammo count to 1 + // ammotag.getCompoundTag("tag"; // set ammo count to 1 tags.setTag("LoadedItem", ammotag); tags.setBoolean("Loaded", true); // remove loaded item - if(ammo.getItem() instanceof IAmmo) - ((IAmmo) ammo.getItem()).consumeAmmo(1, ammo); + if (ammo.getItem() instanceof IAmmo) ((IAmmo) ammo.getItem()).consumeAmmo(1, ammo); else { - if(Loader.isModLoaded("battlegear2")) { - ((InventoryPlayerBattle)player.inventory).consumeInventoryItem(ammo.getItem()); - } - else { + if (Loader.isModLoaded("battlegear2")) { + ((InventoryPlayerBattle) player.inventory).consumeInventoryItem(ammo.getItem()); + } else { player.inventory.consumeInventoryItem(ammo.getItem()); } } @@ -183,19 +157,16 @@ public boolean reload(ItemStack weapon, EntityPlayer player, World world, NBTTag } // stops reloading, or unloads the ammo if it has been loaded - public boolean unload(ItemStack weapon, EntityPlayer player, NBTTagCompound tags) - { + public boolean unload(ItemStack weapon, EntityPlayer player, NBTTagCompound tags) { // is reloading? - if(tags.hasKey("Reloading")) - { + if (tags.hasKey("Reloading")) { // stop it tags.removeTag("Reloading"); return true; } // loaded? - if(tags.getBoolean("Loaded")) - { + if (tags.getBoolean("Loaded")) { // unload ItemStack loadedItem = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("LoadedItem")); AmmoItem ammo = (AmmoItem) loadedItem.getItem(); @@ -214,12 +185,10 @@ public boolean unload(ItemStack weapon, EntityPlayer player, NBTTagCompound tags } // called if loaded to SHOOOOOOOT - public void fire(ItemStack weapon, World world, EntityPlayer player) - { + public void fire(ItemStack weapon, World world, EntityPlayer player) { NBTTagCompound tags = weapon.getTagCompound().getCompoundTag("InfiTool"); // not loaded - if(!tags.getBoolean("Loaded")) - return; + if (!tags.getBoolean("Loaded")) return; // get ammo ItemStack ammo = ItemStack.loadItemStackFromNBT(tags.getCompoundTag("LoadedItem")); @@ -229,37 +198,34 @@ public void fire(ItemStack weapon, World world, EntityPlayer player) tags.removeTag("LoadedItem"); // safety - if(ammo == null) - return; + if (ammo == null) return; float projectileSpeed = getProjectileSpeed(weapon); float windup = getWindupTime(weapon); // max windup time - float accuracy = getAccuracy(weapon, (int)windup); + float accuracy = getAccuracy(weapon, (int) windup); Entity projectile = createProjectile(ammo, world, player, projectileSpeed, accuracy, 1.0f); int reinforced = 0; - if (tags.hasKey("Unbreaking")) - reinforced = tags.getInteger("Unbreaking"); + if (tags.hasKey("Unbreaking")) reinforced = tags.getInteger("Unbreaking"); - if (random.nextInt(10) < 10 - reinforced) - AbilityHelper.damageTool(weapon, 1, player, false); + if (random.nextInt(10) < 10 - reinforced) AbilityHelper.damageTool(weapon, 1, player, false); playFiringSound(world, player, weapon, ammo, projectileSpeed, accuracy); // thwock - if (!world.isRemote) - world.spawnEntityInWorld(projectile); + if (!world.isRemote) world.spawnEntityInWorld(projectile); } @Override public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) { // arrow priority: hotbar > inventory, tinker arrows > regular arrows - if(Loader.isModLoaded("battlegear2")){ + if (Loader.isModLoaded("battlegear2")) { ItemStack offhand = ((InventoryPlayerBattle) player.inventory).getCurrentOffhandWeapon(); - if(offhand != null && (offhand.getItem() instanceof BoltAmmo) && ((IAmmo) offhand.getItem()).getAmmoCount(offhand) > 0) - { + if (offhand != null + && (offhand.getItem() instanceof BoltAmmo) + && ((IAmmo) offhand.getItem()).getAmmoCount(offhand) > 0) { return offhand; } } @@ -267,27 +233,24 @@ public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) { ItemStack[] inventory = player.inventory.mainInventory; // check hotbar for tinker arrows - for(int i = 0; i < inventory.length; i++) - { + for (int i = 0; i < inventory.length; i++) { ItemStack stack = inventory[i]; - if(stack == null) - continue; - if(!(stack.getItem() instanceof BoltAmmo)) - continue; - if(((IAmmo) stack.getItem()).getAmmoCount(stack) <= 0) - continue; + if (stack == null) continue; + if (!(stack.getItem() instanceof BoltAmmo)) continue; + if (((IAmmo) stack.getItem()).getAmmoCount(stack) <= 0) continue; return stack; } - if(player.capabilities.isCreativeMode && TinkerWeaponry.creativeBolt != null) + if (player.capabilities.isCreativeMode && TinkerWeaponry.creativeBolt != null) return TinkerWeaponry.creativeBolt.copy(); return null; } @Override - protected Entity createProjectile(ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, float windup) { + protected Entity createProjectile( + ItemStack ammo, World world, EntityPlayer player, float speed, float accuracy, float windup) { EntityArrow arrow; ItemStack reference = ammo.copy(); @@ -295,8 +258,7 @@ protected Entity createProjectile(ItemStack ammo, World world, EntityPlayer play reference.getTagCompound().getCompoundTag("InfiTool").setInteger("Ammo", 1); arrow = new BoltEntity(world, player, speed, accuracy, reference); - if(player.capabilities.isCreativeMode) - arrow.canBePickedUp = 2; + if (player.capabilities.isCreativeMode) arrow.canBePickedUp = 2; return arrow; } @@ -316,38 +278,33 @@ public void playReloadSound(World world, EntityPlayer player, ItemStack weapon, } @Override - public void playFiringSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy) { + public void playFiringSound( + World world, EntityPlayer player, ItemStack weapon, ItemStack ammo, float speed, float accuracy) { world.playSoundAtEntity(player, "random.bow", 1.0F, 0.5F); } @Override public IIcon getIcon(ItemStack stack, int renderPass) { - if(!animateLayer(renderPass) && renderPass < getPartAmount()) - return super.getIcon(stack, renderPass); + if (!animateLayer(renderPass) && renderPass < getPartAmount()) return super.getIcon(stack, renderPass); - if(!stack.hasTagCompound()) - return super.getIcon(stack, renderPass); + if (!stack.hasTagCompound()) return super.getIcon(stack, renderPass); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if(tags == null || renderPass > 10) - return super.getIcon(stack, renderPass); + if (tags == null || renderPass > 10) return super.getIcon(stack, renderPass); float progress; - if(tags.getBoolean("Loaded")) - progress = 1; - else if(!tags.hasKey("Reloading")) - return super.getIcon(stack, renderPass); - else - progress = getWindupProgress(stack, getWindupTime(stack) - tags.getInteger("Reloading")); + if (tags.getBoolean("Loaded")) progress = 1; + else if (!tags.hasKey("Reloading")) return super.getIcon(stack, renderPass); + else progress = getWindupProgress(stack, getWindupTime(stack) - tags.getInteger("Reloading")); // are we drawing an effect? - if(renderPass >= getPartAmount()) { + if (renderPass >= getPartAmount()) { // is the effect animated? String effect = "Effect" + (1 + renderPass - getPartAmount()); - if(tags.hasKey(effect)) { + if (tags.hasKey(effect)) { int index = tags.getInteger(effect); - if(animationEffectIcons.get(index) != null) + if (animationEffectIcons.get(index) != null) return getCorrectAnimationIcon(animationEffectIcons, index, progress); else // non-animated @@ -357,22 +314,23 @@ else if(!tags.hasKey("Reloading")) } // get the correct icon - switch (renderPass) - { - case 0: return getCorrectAnimationIcon(animationHandleIcons, tags.getInteger("RenderHandle"), progress); - case 1: return getCorrectAnimationIcon(animationHeadIcons, tags.getInteger("RenderHead"), progress); - case 2: return getCorrectAnimationIcon(animationAccessoryIcons, tags.getInteger("RenderAccessory"), progress); - case 3: return getCorrectAnimationIcon(animationExtraIcons, tags.getInteger("RenderExtra"), progress); + switch (renderPass) { + case 0: + return getCorrectAnimationIcon(animationHandleIcons, tags.getInteger("RenderHandle"), progress); + case 1: + return getCorrectAnimationIcon(animationHeadIcons, tags.getInteger("RenderHead"), progress); + case 2: + return getCorrectAnimationIcon(animationAccessoryIcons, tags.getInteger("RenderAccessory"), progress); + case 3: + return getCorrectAnimationIcon(animationExtraIcons, tags.getInteger("RenderExtra"), progress); } return emptyIcon; } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { + public String getIconSuffix(int partType) { + switch (partType) { case 0: return "_crossbow_bow"; // head case 1: @@ -389,14 +347,12 @@ public String getIconSuffix (int partType) } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_crossbow_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "crossbow"; } @@ -411,20 +367,17 @@ protected boolean animateLayer(int renderPass) { } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerWeaponry.partCrossbowLimb; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerWeaponry.partCrossbowBody; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerWeaponry.bowstring; } @@ -438,13 +391,10 @@ public String[] getTraits() { return new String[] {"weapon", "bow", "windup"}; } - @Override - public void buildTool (int id, String name, List list) - { + public void buildTool(int id, String name, List list) { // does the material have a bow material? - if(TConstructRegistry.getBowMaterial(id) == null) - return; + if (TConstructRegistry.getBowMaterial(id) == null) return; // all creative bows use regular bowstring ItemStack headStack = new ItemStack(getHeadItem(), 1, id); @@ -453,8 +403,7 @@ public void buildTool (int id, String name, List list) ItemStack extraStack = getPartAmount() > 3 ? new ItemStack(getExtraItem(), 1, id) : null; ItemStack tool = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, extraStack, ""); - if (tool != null) - { + if (tool != null) { tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); list.add(tool); } @@ -462,17 +411,18 @@ public void buildTool (int id, String name, List list) @Override public int getColorFromItemStack(ItemStack stack, int renderPass) { - if(renderPass != 2 || !stack.hasTagCompound()) - return super.getColorFromItemStack(stack, renderPass); + if (renderPass != 2 || !stack.hasTagCompound()) return super.getColorFromItemStack(stack, renderPass); // bowstring: custom material -> custom coloring // todo: move this into the custom material itself int mat = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Accessory"); - switch(mat) - { - case 0: return 0xffffffff; // string = white - case 1: return 0xffccccff; // macig string = light blue - case 2: return 0xffffcccc; // flamestring = light red + switch (mat) { + case 0: + return 0xffffffff; // string = white + case 1: + return 0xffccccff; // macig string = light blue + case 2: + return 0xffffcccc; // flamestring = light red } return super.getColorFromItemStack(stack, renderPass); } diff --git a/src/main/java/tconstruct/weaponry/weapons/Javelin.java b/src/main/java/tconstruct/weaponry/weapons/Javelin.java index 3510e9210cd..c9f5fd20ae3 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Javelin.java +++ b/src/main/java/tconstruct/weaponry/weapons/Javelin.java @@ -2,10 +2,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.client.CrosshairType; -import tconstruct.weaponry.entity.JavelinEntity; -import tconstruct.library.weaponry.AmmoWeapon; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,7 +9,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.tools.TinkerTools; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.client.CrosshairType; +import tconstruct.weaponry.entity.JavelinEntity; public class Javelin extends AmmoWeapon { public Javelin() { @@ -21,26 +21,21 @@ public Javelin() { } @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) - { + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { // javelin is the only throwing/ammo weapon that hurts on leftclicking return AbilityHelper.onLeftClickEntity(stack, player, entity, this, 0); } @Override public float getWindupProgress(ItemStack itemStack, EntityPlayer player) { - if(!itemStack.hasTagCompound()) - return super.getWindupProgress(itemStack, player); + if (!itemStack.hasTagCompound()) return super.getWindupProgress(itemStack, player); - if(!itemStack.getTagCompound().getCompoundTag("InfiTool").hasKey("Throwing")) - return 0.5f; + if (!itemStack.getTagCompound().getCompoundTag("InfiTool").hasKey("Throwing")) return 0.5f; float timeleft = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("Throwing"); - float threshold = getWindupTime(itemStack)/5; - if(timeleft < threshold) - return (threshold-timeleft)/threshold; - else - return 0.5f - 0.25f * ((float)getWindupTime(itemStack)-timeleft)/threshold; + float threshold = getWindupTime(itemStack) / 5; + if (timeleft < threshold) return (threshold - timeleft) / threshold; + else return 0.5f - 0.25f * ((float) getWindupTime(itemStack) - timeleft) / threshold; } @Override @@ -48,12 +43,10 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); // already throwing - if(tags.hasKey("Throwing")) - return stack; + if (tags.hasKey("Throwing")) return stack; // has ammo? - if(this.getAmmoCount(stack) <= 0) - return stack; + if (this.getAmmoCount(stack) <= 0) return stack; // start throwing tags.setInteger("Throwing", getWindupTime(stack)); @@ -65,21 +58,17 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { super.onUpdate(stack, world, entity, par4, par5); - if(!stack.hasTagCompound()) - return; + if (!stack.hasTagCompound()) return; NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - if(!tags.hasKey("Throwing")) - return; + if (!tags.hasKey("Throwing")) return; EntityPlayer player = (EntityPlayer) entity; - if(player.inventory.getCurrentItem() != stack) - return; + if (player.inventory.getCurrentItem() != stack) return; int timeLeft = tags.getInteger("Throwing"); timeLeft--; - if(timeLeft > 0) - tags.setInteger("Throwing", timeLeft); + if (timeLeft > 0) tags.setInteger("Throwing", timeLeft); else { onPlayerStoppedUsing(stack, world, player, 0); tags.removeTag("Throwing"); @@ -118,8 +107,7 @@ public int getPartAmount() { @Override public String getIconSuffix(int partType) { - switch (partType) - { + switch (partType) { case 0: return "_javelin_head"; case 1: @@ -188,5 +176,7 @@ public float getProjectileSpeed() { @SideOnly(Side.CLIENT) @Override - public CrosshairType getCrosshairType() { return CrosshairType.WEIRD; } + public CrosshairType getCrosshairType() { + return CrosshairType.WEIRD; + } } diff --git a/src/main/java/tconstruct/weaponry/weapons/LongBow.java b/src/main/java/tconstruct/weaponry/weapons/LongBow.java index cc3982968d1..a1d38133a26 100644 --- a/src/main/java/tconstruct/weaponry/weapons/LongBow.java +++ b/src/main/java/tconstruct/weaponry/weapons/LongBow.java @@ -1,15 +1,15 @@ package tconstruct.weaponry.weapons; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.ammo.ArrowAmmo; -import tconstruct.library.weaponry.BowBaseAmmo; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.library.weaponry.BowBaseAmmo; import tconstruct.tools.TinkerTools; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.ammo.ArrowAmmo; public class LongBow extends BowBaseAmmo { public LongBow() { @@ -32,28 +32,25 @@ public float getZoom(ItemStack itemStack) { } @Override - protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { - if(arrows.getItem() instanceof ArrowAmmo) - { + protected Entity createProjectile( + ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { + if (arrows.getItem() instanceof ArrowAmmo) { // modify accuraccy of the arrow depending on its accuraccy and weight NBTTagCompound tags = arrows.getTagCompound().getCompoundTag("InfiTool"); float matAccuracy = tags.getFloat("Accuracy"); float weight = tags.getFloat("Mass"); // we need heavier arrows because we have POW. therefore we increase the weight penality on accuracy - accuracy += ((100f-matAccuracy)/10f)/Math.max(1f, weight-1f); - if(accuracy < 0) - accuracy = 0; + accuracy += ((100f - matAccuracy) / 10f) / Math.max(1f, weight - 1f); + if (accuracy < 0) accuracy = 0; } return super.createProjectile(arrows, world, player, speed, accuracy, windup); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { + public String getIconSuffix(int partType) { + switch (partType) { case 0: return "_bow_top"; case 1: @@ -70,14 +67,12 @@ public String getIconSuffix (int partType) } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_bow_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "longbow"; } @@ -92,20 +87,17 @@ protected boolean animateLayer(int renderPass) { } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerWeaponry.partBowLimb; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerWeaponry.bowstring; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerWeaponry.partBowLimb; } diff --git a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java index 2fb79333fb9..2f097e364a7 100644 --- a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java +++ b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java @@ -3,15 +3,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.entity.EntityPlayerSP; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.ammo.ArrowAmmo; -import tconstruct.library.weaponry.BowBaseAmmo; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.library.weaponry.BowBaseAmmo; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.ammo.ArrowAmmo; public class ShortBow extends BowBaseAmmo { public ShortBow() { @@ -29,28 +29,25 @@ public float maxAccuracy(ItemStack itemStack) { } @Override - protected Entity createProjectile(ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { - if(arrows.getItem() instanceof ArrowAmmo) - { + protected Entity createProjectile( + ItemStack arrows, World world, EntityPlayer player, float speed, float accuracy, float windup) { + if (arrows.getItem() instanceof ArrowAmmo) { // modify accuraccy of the arrow depending on its accuraccy and weight NBTTagCompound tags = arrows.getTagCompound().getCompoundTag("InfiTool"); float matAccuracy = tags.getFloat("Accuracy"); float weight = tags.getFloat("Mass"); // weight influences the accuracy too, but only a little bit. - accuracy += ((100f-matAccuracy)/10f)/(weight); - if(accuracy < 0) - accuracy = 0; + accuracy += ((100f - matAccuracy) / 10f) / (weight); + if (accuracy < 0) accuracy = 0; } return super.createProjectile(arrows, world, player, speed, accuracy, windup); } @Override - public String getIconSuffix (int partType) - { - switch (partType) - { + public String getIconSuffix(int partType) { + switch (partType) { case 0: return "_bow_top"; case 1: @@ -65,14 +62,12 @@ public String getIconSuffix (int partType) } @Override - public String getEffectSuffix () - { + public String getEffectSuffix() { return "_bow_effect"; } @Override - public String getDefaultFolder () - { + public String getDefaultFolder() { return "shortbow"; } @@ -87,35 +82,29 @@ protected boolean animateLayer(int renderPass) { } @Override - public Item getHeadItem () - { + public Item getHeadItem() { return TinkerWeaponry.partBowLimb; } @Override - public Item getHandleItem () - { + public Item getHandleItem() { return TinkerWeaponry.bowstring; } @Override - public Item getAccessoryItem () - { + public Item getAccessoryItem() { return TinkerWeaponry.partBowLimb; } @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { // shortbows are smaller and more mobile than longbows super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 1.5F; player.movementInput.moveStrafe *= 1.5F; } diff --git a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java index 281425665dc..38e69c9adde 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java +++ b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java @@ -1,12 +1,9 @@ package tconstruct.weaponry.weapons; -import tconstruct.weaponry.TinkerWeaponry; -import tconstruct.weaponry.client.CrosshairType; -import tconstruct.client.IconFlipped; -import tconstruct.weaponry.entity.ShurikenEntity; -import tconstruct.library.weaponry.AmmoWeapon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.Iterator; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,9 +12,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.Map; +import tconstruct.client.IconFlipped; +import tconstruct.library.weaponry.AmmoWeapon; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.client.CrosshairType; +import tconstruct.weaponry.entity.ShurikenEntity; public class Shuriken extends AmmoWeapon { @@ -52,8 +51,7 @@ public int durabilityTypeExtra() { @Override public String getIconSuffix(int partType) { - switch (partType) - { + switch (partType) { case 0: return "_shuriken"; case 1: @@ -116,8 +114,7 @@ public float getWindupProgress(ItemStack itemStack, EntityPlayer player) { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if(getAmmoCount(stack) <= 0) - return stack; + if (getAmmoCount(stack) <= 0) return stack; launchProjectile(stack, world, player, 1); @@ -160,8 +157,7 @@ public void registerIcons(IIconRegister iconRegister) { // now we flip all the different part icons, so we only need 1 graphic for 4 different orientations \o/ // handle first: flip x Iterator> iter = handleIcons.entrySet().iterator(); - while(iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry entry = iter.next(); entry.setValue(new IconFlipped(entry.getValue(), true, false)); // the entry object should reference the direct object in the map, no further updating needed @@ -169,16 +165,14 @@ public void registerIcons(IIconRegister iconRegister) { // accessory: flip y iter = accessoryIcons.entrySet().iterator(); - while(iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry entry = iter.next(); entry.setValue(new IconFlipped(entry.getValue(), false, true)); } // extra: flip x and y iter = extraIcons.entrySet().iterator(); - while(iter.hasNext()) - { + while (iter.hasNext()) { Map.Entry entry = iter.next(); entry.setValue(new IconFlipped(entry.getValue(), true, true)); } @@ -189,6 +183,4 @@ public void registerIcons(IIconRegister iconRegister) { public CrosshairType getCrosshairType() { return CrosshairType.TIP; } - - } diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java index f40ede05dfe..f2e2d3493b9 100644 --- a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java +++ b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java @@ -1,18 +1,18 @@ package tconstruct.weaponry.weapons; -import net.minecraft.client.entity.EntityPlayerSP; -import tconstruct.library.entity.ProjectileBase; -import tconstruct.weaponry.client.CrosshairType; -import tconstruct.weaponry.entity.ThrowingKnifeEntity; -import tconstruct.library.weaponry.AmmoWeapon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.library.entity.ProjectileBase; +import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.tools.TinkerTools; +import tconstruct.weaponry.client.CrosshairType; +import tconstruct.weaponry.entity.ThrowingKnifeEntity; public class ThrowingKnife extends AmmoWeapon { public ThrowingKnife() { @@ -26,8 +26,7 @@ public int getPartAmount() { @Override public String getIconSuffix(int partType) { - switch (partType) - { + switch (partType) { case 0: return "_knife_blade"; case 1: @@ -60,7 +59,9 @@ public Item getAccessoryItem() { } @Override - public int getWindupTime(ItemStack itemStack) { return 15; } // 1 1/2 seconds + public int getWindupTime(ItemStack itemStack) { + return 15; + } // 1 1/2 seconds @Override public float getMinWindupProgress(ItemStack itemStack) { @@ -81,8 +82,7 @@ public float minAccuracy(ItemStack itemStack) { protected Entity createProjectile(ItemStack reference, World world, EntityPlayer player, float accuracy, int time) { ProjectileBase knife = new ThrowingKnifeEntity(world, player, getProjectileSpeed(), accuracy, reference); // if you aim long enough, it's a crit! - if(time >= this.getWindupTime(reference)*1.5f) - knife.setIsCritical(true); + if (time >= this.getWindupTime(reference) * 1.5f) knife.setIsCritical(true); return knife; } @@ -100,16 +100,13 @@ public CrosshairType getCrosshairType() { @Override @SideOnly(Side.CLIENT) - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { // aiming with throwing knives slows down much less than with a bow super.onUpdate(stack, world, entity, par4, par5); - if (entity instanceof EntityPlayerSP) - { + if (entity instanceof EntityPlayerSP) { EntityPlayerSP player = (EntityPlayerSP) entity; ItemStack usingItem = player.getItemInUse(); - if (usingItem != null && usingItem.getItem() == this) - { + if (usingItem != null && usingItem.getItem() == this) { player.movementInput.moveForward *= 3.0F; player.movementInput.moveStrafe *= 3.0F; } diff --git a/src/main/java/tconstruct/world/MiningExplosion.java b/src/main/java/tconstruct/world/MiningExplosion.java index 9b2f222dd07..72166b848e1 100644 --- a/src/main/java/tconstruct/world/MiningExplosion.java +++ b/src/main/java/tconstruct/world/MiningExplosion.java @@ -10,22 +10,19 @@ import net.minecraft.util.*; import net.minecraft.world.*; -public class MiningExplosion extends Explosion -{ +public class MiningExplosion extends Explosion { World world; private Random random = new Random(); private int field_77289_h = 16; private Map field_77288_k = new HashMap(); - public MiningExplosion(World par1World, Entity par2Entity, double par3, double par5, double par7, float par9) - { + public MiningExplosion(World par1World, Entity par2Entity, double par3, double par5, double par7, float par9) { super(par1World, par2Entity, par3, par5, par7, par9); world = par1World; } @Override - public void doExplosionA () - { + public void doExplosionA() { float f = this.explosionSize; HashSet hashset = new HashSet(); int i; @@ -35,14 +32,15 @@ public void doExplosionA () double d1; double d2; - for (i = 0; i < this.field_77289_h; ++i) - { - for (j = 0; j < this.field_77289_h; ++j) - { - for (k = 0; k < this.field_77289_h; ++k) - { - if (i == 0 || i == this.field_77289_h - 1 || j == 0 || j == this.field_77289_h - 1 || k == 0 || k == this.field_77289_h - 1) - { + for (i = 0; i < this.field_77289_h; ++i) { + for (j = 0; j < this.field_77289_h; ++j) { + for (k = 0; k < this.field_77289_h; ++k) { + if (i == 0 + || i == this.field_77289_h - 1 + || j == 0 + || j == this.field_77289_h - 1 + || k == 0 + || k == this.field_77289_h - 1) { double d3 = (double) ((float) i / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F); double d4 = (double) ((float) j / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F); double d5 = (double) ((float) k / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F); @@ -55,22 +53,24 @@ public void doExplosionA () d1 = this.explosionY; d2 = this.explosionZ; - for (float f2 = 0.3F; f1 > 0.0F; f1 -= f2 * 0.75F) - { + for (float f2 = 0.3F; f1 > 0.0F; f1 -= f2 * 0.75F) { int l = MathHelper.floor_double(d0); int i1 = MathHelper.floor_double(d1); int j1 = MathHelper.floor_double(d2); Block k1 = this.world.getBlock(l, i1, j1); - if (k1 != Blocks.air) - { + if (k1 != Blocks.air) { Block block = k1; - float f3 = this.exploder != null ? this.exploder.func_145772_a(this, this.world, l, i1, j1, block) : block.getExplosionResistance(this.exploder, world, l, i1, j1, explosionX, explosionY, explosionZ); + float f3 = this.exploder != null + ? this.exploder.func_145772_a(this, this.world, l, i1, j1, block) + : block.getExplosionResistance( + this.exploder, world, l, i1, j1, explosionX, explosionY, explosionZ); f1 -= (f3 + 0.8F) * f2 * 0.25f; } - if (f1 > 0.0F && (this.exploder == null || this.exploder.func_145774_a(this, this.world, l, i1, j1, k1, f1))) - { + if (f1 > 0.0F + && (this.exploder == null + || this.exploder.func_145774_a(this, this.world, l, i1, j1, k1, f1))) { hashset.add(new ChunkPosition(l, i1, j1)); } @@ -91,38 +91,40 @@ public void doExplosionA () int l1 = MathHelper.floor_double(this.explosionY + (double) this.explosionSize + 1.0D); int i2 = MathHelper.floor_double(this.explosionZ - (double) this.explosionSize - 1.0D); int j2 = MathHelper.floor_double(this.explosionZ + (double) this.explosionSize + 1.0D); - List list = this.world.getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getBoundingBox((double) i, (double) k, (double) i2, (double) j, (double) l1, (double) j2)); + List list = this.world.getEntitiesWithinAABBExcludingEntity( + this.exploder, + AxisAlignedBB.getBoundingBox( + (double) i, (double) k, (double) i2, (double) j, (double) l1, (double) j2)); Vec3 vec3 = Vec3.createVectorHelper(this.explosionX, this.explosionY, this.explosionZ); - for (int k2 = 0; k2 < list.size(); ++k2) - { + for (int k2 = 0; k2 < list.size(); ++k2) { Entity entity = (Entity) list.get(k2); - double d7 = entity.getDistance(this.explosionX, this.explosionY, this.explosionZ) / (double) this.explosionSize; + double d7 = + entity.getDistance(this.explosionX, this.explosionY, this.explosionZ) / (double) this.explosionSize; - if (d7 <= 1.0D) - { + if (d7 <= 1.0D) { d0 = entity.posX - this.explosionX; d1 = entity.posY + (double) entity.getEyeHeight() - this.explosionY; d2 = entity.posZ - this.explosionZ; double d8 = (double) MathHelper.sqrt_double(d0 * d0 + d1 * d1 + d2 * d2); - if (d8 != 0.0D) - { + if (d8 != 0.0D) { d0 /= d8; d1 /= d8; d2 /= d8; double d9 = (double) this.world.getBlockDensity(vec3, entity.boundingBox); double d10 = (1.0D - d7) * d9; if (!(entity instanceof EntityItem)) - entity.attackEntityFrom(DamageSource.setExplosionSource(this), (float) ((int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.explosionSize + 1.0D))); + entity.attackEntityFrom(DamageSource.setExplosionSource(this), (float) + ((int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.explosionSize + 1.0D))); double d11 = EnchantmentProtection.func_92092_a(entity, d10); entity.motionX += d0 * d11; entity.motionY += d1 * d11; entity.motionZ += d2 * d11; - if (entity instanceof EntityPlayer) - { - this.field_77288_k.put((EntityPlayer) entity, Vec3.createVectorHelper(d0 * d10, d1 * d10, d2 * d10)); + if (entity instanceof EntityPlayer) { + this.field_77288_k.put( + (EntityPlayer) entity, Vec3.createVectorHelper(d0 * d10, d1 * d10, d2 * d10)); } } } @@ -132,17 +134,21 @@ public void doExplosionA () } @Override - public void doExplosionB (boolean par1) - { - this.world.playSoundEffect(this.explosionX, this.explosionY, this.explosionZ, "random.explode", 4.0F, (1.0F + (this.world.rand.nextFloat() - this.world.rand.nextFloat()) * 0.2F) * 0.7F); - - if (this.explosionSize >= 2.0F && this.isSmoking) - { - this.world.spawnParticle("hugeexplosion", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); - } - else - { - this.world.spawnParticle("largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); + public void doExplosionB(boolean par1) { + this.world.playSoundEffect( + this.explosionX, + this.explosionY, + this.explosionZ, + "random.explode", + 4.0F, + (1.0F + (this.world.rand.nextFloat() - this.world.rand.nextFloat()) * 0.2F) * 0.7F); + + if (this.explosionSize >= 2.0F && this.isSmoking) { + this.world.spawnParticle( + "hugeexplosion", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); + } else { + this.world.spawnParticle( + "largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D); } Iterator iterator; @@ -152,20 +158,17 @@ public void doExplosionB (boolean par1) int k; Block l; - if (this.isSmoking) - { + if (this.isSmoking) { iterator = this.affectedBlockPositions.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { chunkposition = (ChunkPosition) iterator.next(); i = chunkposition.chunkPosX; j = chunkposition.chunkPosY; k = chunkposition.chunkPosZ; l = this.world.getBlock(i, j, k); - if (par1) - { + if (par1) { double d0 = (double) ((float) i + this.world.rand.nextFloat()); double d1 = (double) ((float) j + this.world.rand.nextFloat()); double d2 = (double) ((float) k + this.world.rand.nextFloat()); @@ -181,17 +184,23 @@ public void doExplosionB (boolean par1) d3 *= d7; d4 *= d7; d5 *= d7; - this.world.spawnParticle("explode", (d0 + this.explosionX * 1.0D) / 2.0D, (d1 + this.explosionY * 1.0D) / 2.0D, (d2 + this.explosionZ * 1.0D) / 2.0D, d3, d4, d5); + this.world.spawnParticle( + "explode", + (d0 + this.explosionX * 1.0D) / 2.0D, + (d1 + this.explosionY * 1.0D) / 2.0D, + (d2 + this.explosionZ * 1.0D) / 2.0D, + d3, + d4, + d5); this.world.spawnParticle("smoke", d0, d1, d2, d3, d4, d5); } - if (l != Blocks.air) - { + if (l != Blocks.air) { Block block = l; - if (block.canDropFromExplosion(this)) - { - block.dropBlockAsItemWithChance(this.world, i, j, k, this.world.getBlockMetadata(i, j, k), 1.0F, 0); + if (block.canDropFromExplosion(this)) { + block.dropBlockAsItemWithChance( + this.world, i, j, k, this.world.getBlockMetadata(i, j, k), 1.0F, 0); } block.onBlockExploded(this.world, i, j, k, this); @@ -199,12 +208,10 @@ public void doExplosionB (boolean par1) } } - if (this.isFlaming) - { + if (this.isFlaming) { iterator = this.affectedBlockPositions.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { chunkposition = (ChunkPosition) iterator.next(); i = chunkposition.chunkPosX; j = chunkposition.chunkPosY; @@ -212,8 +219,7 @@ public void doExplosionB (boolean par1) l = this.world.getBlock(i, j, k); Block i1 = this.world.getBlock(i, j - 1, k); - if (l == Blocks.air && i1.isOpaqueCube() && this.random.nextInt(3) == 0) - { + if (l == Blocks.air && i1.isOpaqueCube() && this.random.nextInt(3) == 0) { this.world.setBlock(i, j, k, Blocks.fire); } } diff --git a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java index 5b241896ac0..dfc755e371a 100644 --- a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java @@ -7,23 +7,20 @@ import net.minecraft.util.EnumFacing; import tconstruct.tools.items.TitleIcon; -public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem -{ +public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem { /** * Dispense the specified stack, play the dispense sound and spawn * particles. */ @Override - public ItemStack dispenseStack (IBlockSource par1IBlockSource, ItemStack par2ItemStack) - { + public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing enumfacing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); double d0 = par1IBlockSource.getX() + (double) enumfacing.getFrontOffsetX(); double d1 = (double) ((float) par1IBlockSource.getYInt() + 0.2F); double d2 = par1IBlockSource.getZ() + (double) enumfacing.getFrontOffsetZ(); EntityLiving entity = TitleIcon.activateSpawnEgg(par2ItemStack, par1IBlockSource.getWorld(), d0, d1, d2, 0); - if (par2ItemStack.hasDisplayName()) - { + if (par2ItemStack.hasDisplayName()) { ((EntityLiving) entity).setCustomNameTag(par2ItemStack.getDisplayName()); } diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index dc5f19eff2f..fff01b9571a 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -1,7 +1,7 @@ package tconstruct.world; -import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @@ -44,11 +44,13 @@ @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' World", description = "Ores, slime islands, essence berries, and the like.", forced = true) -public class TinkerWorld -{ +public class TinkerWorld { @Instance("TinkerWorld") public static TinkerWorld instance; - @SidedProxy(clientSide = "tconstruct.world.TinkerWorldProxyClient", serverSide = "tconstruct.world.TinkerWorldProxyCommon") + + @SidedProxy( + clientSide = "tconstruct.world.TinkerWorldProxyClient", + serverSide = "tconstruct.world.TinkerWorldProxyCommon") public static TinkerWorldProxyCommon proxy; public static Item strangeFood; @@ -92,11 +94,10 @@ public class TinkerWorld public static Item goldHead; @Handler - public void preInit (FMLPreInitializationEvent event) - { + public void preInit(FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new TinkerWorldEvents()); - //Blocks + // Blocks TinkerWorld.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock"); TinkerWorld.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth"); TinkerWorld.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); @@ -108,7 +109,10 @@ public void preInit (FMLPreInitializationEvent event) TinkerWorld.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).setBlockName("trap.barricade.spruce"); TinkerWorld.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch"); TinkerWorld.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle"); - TinkerWorld.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass).setBlockName("explosive.slime"); + TinkerWorld.slimeExplosive = new SlimeExplosive() + .setHardness(0.0F) + .setStepSound(Block.soundTypeGrass) + .setBlockName("explosive.slime"); // Slime TinkerWorld.slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); @@ -116,20 +120,43 @@ public void preInit (FMLPreInitializationEvent event) TinkerWorld.blueSlimeFluid = new Fluid("slime.blue"); if (!FluidRegistry.registerFluid(TinkerWorld.blueSlimeFluid)) TinkerWorld.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); - TinkerWorld.slimePool = new SlimeFluid(TinkerWorld.blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep).setBlockName("liquid.slime"); + TinkerWorld.slimePool = new SlimeFluid(TinkerWorld.blueSlimeFluid, Material.water) + .setCreativeTab(TConstructRegistry.blockTab) + .setStepSound(TinkerWorld.slimeStep) + .setBlockName("liquid.slime"); GameRegistry.registerBlock(TinkerWorld.slimePool, "liquid.slime"); TinkerWorld.blueSlimeFluid.setBlock(TinkerWorld.slimePool); // Slime Islands - TinkerWorld.slimeGel = new SlimeGel().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0).setBlockName("slime.gel"); + TinkerWorld.slimeGel = new SlimeGel() + .setStepSound(TinkerWorld.slimeStep) + .setLightOpacity(0) + .setBlockName("slime.gel"); TinkerWorld.slimeGel.setHarvestLevel("axe", 0, 1); - TinkerWorld.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0).setBlockName("slime.grass"); - TinkerWorld.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); - TinkerWorld.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0).setBlockName("slime.leaves"); - TinkerWorld.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TinkerWorld.slimeStep).setBlockName("slime.sapling"); - TinkerWorld.slimeChannel = new ConveyorBase(Material.water, "greencurrent").setHardness(0.3f).setStepSound(TinkerWorld.slimeStep).setBlockName("slime.channel"); - TinkerWorld.bloodChannel = new ConveyorBase(Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TinkerWorld.slimeStep).setBlockName("blood.channel"); - TinkerWorld.slimePad = new SlimePad(Material.cloth).setStepSound(TinkerWorld.slimeStep).setHardness(0.3f).setBlockName("slime.pad"); + TinkerWorld.slimeGrass = new SlimeGrass() + .setStepSound(Block.soundTypeGrass) + .setLightOpacity(0) + .setBlockName("slime.grass"); + TinkerWorld.slimeTallGrass = + new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); + TinkerWorld.slimeLeaves = (SlimeLeaves) new SlimeLeaves() + .setStepSound(TinkerWorld.slimeStep) + .setLightOpacity(0) + .setBlockName("slime.leaves"); + TinkerWorld.slimeSapling = (SlimeSapling) + new SlimeSapling().setStepSound(TinkerWorld.slimeStep).setBlockName("slime.sapling"); + TinkerWorld.slimeChannel = new ConveyorBase(Material.water, "greencurrent") + .setHardness(0.3f) + .setStepSound(TinkerWorld.slimeStep) + .setBlockName("slime.channel"); + TinkerWorld.bloodChannel = new ConveyorBase(Material.water, "liquid_cow") + .setHardness(0.3f) + .setStepSound(TinkerWorld.slimeStep) + .setBlockName("blood.channel"); + TinkerWorld.slimePad = new SlimePad(Material.cloth) + .setStepSound(TinkerWorld.slimeStep) + .setHardness(0.3f) + .setBlockName("slime.pad"); // Decoration TinkerWorld.stoneTorch = new StoneTorch().setBlockName("decoration.stonetorch"); @@ -139,12 +166,29 @@ public void preInit (FMLPreInitializationEvent event) TinkerTools.multiBrickMetal = new MultiBrickMetal().setBlockName("Decoration.BrickMetal"); // Ores - String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; - TinkerWorld.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setBlockName("ore.berries.one"); - String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; - TinkerWorld.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setBlockName("ore.berries.two"); - - String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; + String[] berryOres = new String[] { + "berry_iron", + "berry_gold", + "berry_copper", + "berry_tin", + "berry_iron_ripe", + "berry_gold_ripe", + "berry_copper_ripe", + "berry_tin_ripe" + }; + TinkerWorld.oreBerry = (OreberryBush) + new OreberryBush(berryOres, 0, 4, new String[] {"oreIron", "oreGold", "oreCopper", "oreTin"}) + .setBlockName("ore.berries.one"); + String[] berryOresTwo = new String[] { + "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" + }; + TinkerWorld.oreBerrySecond = + (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] {"oreAluminum", "oreSilver"}) + .setBlockName("ore.berries.two"); + + String[] oreTypes = new String[] { + "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" + }; TinkerWorld.oreSlag = new MetalOre(Material.rock, 10.0F, oreTypes).setBlockName("tconstruct.stoneore"); TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 4, 1); TinkerWorld.oreSlag.setHarvestLevel("pickaxe", 4, 2); @@ -160,7 +204,10 @@ public void preInit (FMLPreInitializationEvent event) TinkerWorld.oreGravel.setHarvestLevel("shovel", 1, 4); TinkerWorld.oreGravel.setHarvestLevel("shovel", 4, 5); // Rail - TinkerWorld.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood).setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood"); + TinkerWorld.woodenRail = new WoodRail() + .setStepSound(Block.soundTypeWood) + .setCreativeTab(TConstructRegistry.blockTab) + .setBlockName("rail.wood"); GameRegistry.registerBlock(TinkerWorld.meatBlock, HamboneItemBlock.class, "MeatBlock"); OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock)); @@ -196,8 +243,10 @@ public void preInit (FMLPreInitializationEvent event) GameRegistry.registerBlock(TinkerWorld.stoneTorch, "decoration.stonetorch"); GameRegistry.registerBlock(TinkerWorld.stoneLadder, "decoration.stoneladder"); GameRegistry.registerBlock(TinkerTools.multiBrick, MultiBrickItem.class, "decoration.multibrick"); - GameRegistry.registerBlock(TinkerTools.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); - GameRegistry.registerBlock(TinkerTools.multiBrickMetal, MultiBrickMetalItem.class, "decoration.multibrickmetal"); + GameRegistry.registerBlock( + TinkerTools.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); + GameRegistry.registerBlock( + TinkerTools.multiBrickMetal, MultiBrickMetalItem.class, "decoration.multibrickmetal"); // Ores GameRegistry.registerBlock(TinkerWorld.oreBerry, OreberryBushItem.class, "ore.berries.one"); @@ -208,19 +257,22 @@ public void preInit (FMLPreInitializationEvent event) // Rail GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood"); - //Items - goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); + // Items + goldHead = new GoldenHead(4, 1.2F, false) + .setAlwaysEdible() + .setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F) + .setUnlocalizedName("goldenhead"); GameRegistry.registerItem(goldHead, "goldHead"); TinkerWorld.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood"); TinkerWorld.oreBerries = new OreBerries().setUnlocalizedName("oreberry"); GameRegistry.registerItem(TinkerWorld.strangeFood, "strangeFood"); GameRegistry.registerItem(TinkerWorld.oreBerries, "oreBerries"); - String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" }; + String[] oreberries = {"Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence"}; - for (int i = 0; i < oreberries.length; i++) - { - TConstructRegistry.addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(TinkerWorld.oreBerries, 1, i)); + for (int i = 0; i < oreberries.length; i++) { + TConstructRegistry.addItemStackToDirectory( + "oreberry" + oreberries[i], new ItemStack(TinkerWorld.oreBerries, 1, i)); } TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(TinkerWorld.strangeFood, 1, 0)); @@ -244,8 +296,7 @@ public void preInit (FMLPreInitializationEvent event) } @Handler - public void init (FMLInitializationEvent event) - { + public void init(FMLInitializationEvent event) { craftingTableRecipes(); addRecipesForFurnace(); addLoot(); @@ -257,13 +308,9 @@ public void init (FMLInitializationEvent event) } @Handler - public void postInit (FMLPostInitializationEvent evt) - { - - } + public void postInit(FMLPostInitializationEvent evt) {} - public void createEntities () - { + public void createEntities() { EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true); @@ -277,187 +324,532 @@ public void createEntities () // EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, // TConstruct.instance, 64, 5, true); - if (PHConstruct.naturalSlimeSpawn > 0) - { - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.FOREST)); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS)); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.MOUNTAIN)); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.HILLS)); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.SWAMP)); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.JUNGLE)); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.WASTELAND)); + if (PHConstruct.naturalSlimeSpawn > 0) { + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.FOREST)); + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS)); + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.MOUNTAIN)); + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.HILLS)); + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.SWAMP)); + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.JUNGLE)); + EntityRegistry.addSpawn( + BlueSlime.class, + PHConstruct.naturalSlimeSpawn, + 4, + 20, + EnumCreatureType.monster, + BiomeDictionary.getBiomesForType(BiomeDictionary.Type.WASTELAND)); } } - private void craftingTableRecipes () - { - String[] patBlock = { "###", "###", "###" }; - String[] patSurround = { "###", "#m#", "###" }; + private void craftingTableRecipes() { + String[] patBlock = {"###", "###", "###"}; + String[] patSurround = {"###", "#m#", "###"}; // Metal conversion Recipes - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 3), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 9)); // Copper - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 5), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 10)); // Tin - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 6), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 11)); // Aluminum + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 3), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 9)); // Copper + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 5), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 10)); // Tin + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 6), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 11)); // Aluminum // GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 6), // patBlock, '#', new ItemStack(TRepo.materials, 1, 12)); // Aluminum - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 4), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 13)); // Bronze - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 7), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 14)); // AluBrass - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 0), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 3)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 1), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 4)); // Ardite - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 2), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 5)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 8), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 15)); // Alumite - GameRegistry.addRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 9), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 16)); // Steel - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 11), "#", '#', new ItemStack(TinkerTools.materials, 1, 12)); // Aluminum raw -> + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 4), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 13)); // Bronze + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 7), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 14)); // AluBrass + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 0), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 3)); // Cobalt + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 1), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 4)); // Ardite + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 2), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 5)); // Manyullyn + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 8), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 15)); // Alumite + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.metalBlock, 1, 9), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 16)); // Steel + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 11), + "#", + '#', + new ItemStack(TinkerTools.materials, 1, 12)); // Aluminum raw -> // ingot - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 9), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 3)); // Copper - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 10), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 5)); // Tin - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 11), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 6)); // Aluminum - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 13), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 4)); // Bronze - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 14), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 7)); // AluBrass - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 3), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 0)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 4), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 1)); // Ardite - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 5), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 2)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 15), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 8)); // Alumite - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 16), "m", 'm', new ItemStack(TinkerWorld.metalBlock, 1, 9)); // Steel - - GameRegistry.addRecipe(new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 19)); // Iron - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 9), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 20)); // Copper - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 10), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 21)); // Tin - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 11), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 22)); // Aluminum - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 14), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 24)); // Aluminum Brass - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 18), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 27)); // Obsidian - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 3), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 28)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 4), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 29)); // Ardite - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 5), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 30)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 13), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 31)); // Bronze - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 15), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 32)); // Alumite - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 16), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 33)); // Steel - - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); // Iron - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 20), "m", 'm', new ItemStack(TinkerTools.materials, 1, 9)); // Copper - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 21), "m", 'm', new ItemStack(TinkerTools.materials, 1, 10)); // Tin - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 22), "m", 'm', new ItemStack(TinkerTools.materials, 1, 11)); // Aluminum + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 9), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 3)); // Copper + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 10), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 5)); // Tin + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 11), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 6)); // Aluminum + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 13), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 4)); // Bronze + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 14), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 7)); // AluBrass + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 3), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 0)); // Cobalt + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 4), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 1)); // Ardite + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 5), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 2)); // Manyullyn + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 15), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 8)); // Alumite + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 16), + "m", + 'm', + new ItemStack(TinkerWorld.metalBlock, 1, 9)); // Steel + + GameRegistry.addRecipe( + new ItemStack(Items.iron_ingot), patBlock, '#', new ItemStack(TinkerTools.materials, 1, 19)); // Iron + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 9), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 20)); // Copper + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 10), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 21)); // Tin + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 11), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 22)); // Aluminum + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 14), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 24)); // Aluminum Brass + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 18), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 27)); // Obsidian + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 3), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 28)); // Cobalt + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 4), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 29)); // Ardite + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 5), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 30)); // Manyullyn + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 13), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 31)); // Bronze + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 15), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 32)); // Alumite + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 1, 16), + patBlock, + '#', + new ItemStack(TinkerTools.materials, 1, 33)); // Steel + + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 19), "m", 'm', new ItemStack(Items.iron_ingot)); // Iron + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 20), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 9)); // Copper + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 21), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 10)); // Tin + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 22), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 11)); // Aluminum // GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 22), "m", // 'm', new ItemStack(TRepo.materials, 1, 12)); //Aluminum - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 24), "m", 'm', new ItemStack(TinkerTools.materials, 1, 14)); // Aluminum Brass - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 27), "m", 'm', new ItemStack(TinkerTools.materials, 1, 18)); // Obsidian - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 28), "m", 'm', new ItemStack(TinkerTools.materials, 1, 3)); // Cobalt - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 29), "m", 'm', new ItemStack(TinkerTools.materials, 1, 4)); // Ardite - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 30), "m", 'm', new ItemStack(TinkerTools.materials, 1, 5)); // Manyullyn - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 31), "m", 'm', new ItemStack(TinkerTools.materials, 1, 13)); // Bronze - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 32), "m", 'm', new ItemStack(TinkerTools.materials, 1, 15)); // Alumite - GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 33), "m", 'm', new ItemStack(TinkerTools.materials, 1, 16)); // Steel - - String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 24), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 14)); // Aluminum Brass + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 27), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 18)); // Obsidian + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 28), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 3)); // Cobalt + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 29), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 4)); // Ardite + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 30), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 5)); // Manyullyn + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 31), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 13)); // Bronze + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 32), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 15)); // Alumite + GameRegistry.addRecipe( + new ItemStack(TinkerTools.materials, 9, 33), + "m", + 'm', + new ItemStack(TinkerTools.materials, 1, 16)); // Steel + + String[] dyeTypes = { + "dyeBlack", + "dyeRed", + "dyeGreen", + "dyeBrown", + "dyeBlue", + "dyePurple", + "dyeCyan", + "dyeLightGray", + "dyeGray", + "dyePink", + "dyeLime", + "dyeYellow", + "dyeLightBlue", + "dyeMagenta", + "dyeOrange", + "dyeWhite" + }; String color = ""; - for (int i = 0; i < 16; i++) - { + for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.wool, 8, i), patSurround, 'm', color, '#', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(Blocks.wool, 8, i), + patSurround, + 'm', + color, + '#', + new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); } // Jack o'Latern Recipe - Stone Torch - GameRegistry.addRecipe(new ItemStack(Blocks.lit_pumpkin, 1, 0), "p", "s", 'p', new ItemStack(Blocks.pumpkin), 's', new ItemStack(TinkerWorld.stoneTorch)); + GameRegistry.addRecipe( + new ItemStack(Blocks.lit_pumpkin, 1, 0), + "p", + "s", + 'p', + new ItemStack(Blocks.pumpkin), + 's', + new ItemStack(TinkerWorld.stoneTorch)); // Stone Torch Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneTorch, 4), "p", "w", 'p', new ItemStack(Items.coal, 1, Short.MAX_VALUE), 'w', "rodStone")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerWorld.stoneTorch, 4), + "p", + "w", + 'p', + new ItemStack(Items.coal, 1, Short.MAX_VALUE), + 'w', + "rodStone")); // Stone Ladder Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneLadder, 3), "w w", "www", "w w", 'w', "rodStone")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerWorld.stoneLadder, 3), "w w", "www", "w w", 'w', "rodStone")); // Wooden Rail Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(TinkerWorld.woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); // Stonesticks Recipes GameRegistry.addRecipe(new ItemStack(TinkerTools.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Blocks.stone)); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone)); + GameRegistry.addRecipe( + new ItemStack(TinkerTools.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone)); // ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); // Clock Recipe - Vanilla alternative - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.clock), " i ", "iri", " i ", 'i', aluBrass, 'r', "dustRedstone")); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(Items.clock), " i ", "iri", " i ", 'i', aluBrass, 'r', "dustRedstone")); // Gold Pressure Plate - Vanilla alternative // todo: temporarily disabled due to light weighted pressure plate being smeltable to gold - //GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate, 0, 1), "ii", 'i', aluBrass); + // GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate, 0, 1), "ii", 'i', aluBrass); // Ultra hardcore recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(goldHead), patSurround, '#', "ingotGold", 'm', new ItemStack(Items.skull, 1, 3))); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(goldHead), patSurround, '#', "ingotGold", 'm', new ItemStack(Items.skull, 1, 3))); // Wool Slab Recipes - for (int sc = 0; sc <= 7; sc++) - { - GameRegistry.addRecipe(new ItemStack(TinkerWorld.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); - GameRegistry.addRecipe(new ItemStack(TinkerWorld.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); - - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc), new ItemStack(TinkerWorld.woolSlab1, 1, sc), new ItemStack(TinkerWorld.woolSlab1, 1, sc)); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc + 8), new ItemStack(TinkerWorld.woolSlab2, 1, sc), new ItemStack(TinkerWorld.woolSlab2, 1, sc)); + for (int sc = 0; sc <= 7; sc++) { + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); + + GameRegistry.addShapelessRecipe( + new ItemStack(Blocks.wool, 1, sc), + new ItemStack(TinkerWorld.woolSlab1, 1, sc), + new ItemStack(TinkerWorld.woolSlab1, 1, sc)); + GameRegistry.addShapelessRecipe( + new ItemStack(Blocks.wool, 1, sc + 8), + new ItemStack(TinkerWorld.woolSlab2, 1, sc), + new ItemStack(TinkerWorld.woolSlab2, 1, sc)); } GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth")); // Trap Recipes - GameRegistry.addRecipe(new ItemStack(TinkerWorld.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); - GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); - GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); - GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(TinkerWorld.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); // Slime Recipes GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 0), "##", "##", '#', TinkerWorld.strangeFood); - GameRegistry.addRecipe(new ItemStack(TinkerWorld.strangeFood, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 0)); + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.strangeFood, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 0)); GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 1), "##", "##", '#', Items.slime_ball); - GameRegistry.addRecipe(new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 1)); + GameRegistry.addRecipe( + new ItemStack(Items.slime_ball, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 1)); // slimeExplosive GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), Items.slime_ball, Blocks.tnt); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 2), TinkerWorld.strangeFood, Blocks.tnt); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); - - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, Short.MAX_VALUE), "dustRedstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.bloodChannel, 1, 0), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), "dustRedstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", "dustRedstone")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimePad, 1, 0), TinkerWorld.slimeChannel, "slimeball")); - - GameRegistry.addRecipe(new ItemStack(TinkerWorld.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Items.bone), 'm', new ItemStack(Items.porkchop)); + GameRegistry.addShapelessRecipe( + new ItemStack(TinkerWorld.slimeExplosive, 1, 2), TinkerWorld.strangeFood, Blocks.tnt); + GameRegistry.addRecipe( + new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); + + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerWorld.slimeChannel, 1, 0), + new ItemStack(TinkerWorld.slimeGel, 1, Short.MAX_VALUE), + "dustRedstone")); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerWorld.bloodChannel, 1, 0), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + new ItemStack(TinkerWorld.strangeFood, 1, 1), + "dustRedstone")); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerWorld.slimeChannel, 1, 0), + "slimeball", + "slimeball", + "slimeball", + "slimeball", + "dustRedstone")); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(TinkerWorld.slimePad, 1, 0), TinkerWorld.slimeChannel, "slimeball")); + + GameRegistry.addRecipe( + new ItemStack(TinkerWorld.meatBlock), + "mmm", + "mbm", + "mmm", + 'b', + new ItemStack(Items.bone), + 'm', + new ItemStack(Items.porkchop)); } - private void addRecipesForFurnace () - { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 3), new ItemStack(TinkerTools.craftedSoil, 1, 4), 0.2f); // Concecrated + private void addRecipesForFurnace() { + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 3), + new ItemStack(TinkerTools.craftedSoil, 1, 4), + 0.2f); // Concecrated // Soil - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 0), new ItemStack(TinkerTools.materials, 1, 1), 2f); // Slime - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 1), new ItemStack(TinkerTools.materials, 1, 2), 2f); // Seared brick item - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 2), new ItemStack(TinkerTools.materials, 1, 17), 2f); // Blue Slime - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 6), new ItemStack(TinkerTools.materials, 1, 37), 2f); // Nether seared + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 0), + new ItemStack(TinkerTools.materials, 1, 1), + 2f); // Slime + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 1), + new ItemStack(TinkerTools.materials, 1, 2), + 2f); // Seared brick item + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 2), + new ItemStack(TinkerTools.materials, 1, 17), + 2f); // Blue Slime + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.craftedSoil, 1, 6), + new ItemStack(TinkerTools.materials, 1, 37), + 2f); // Nether seared // brick // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, // 1, new ItemStack(TRepo.materials, 1, 3), 3f); // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, // 2, new ItemStack(TRepo.materials, 1, 4), 3f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreSlag, 1, 3), new ItemStack(TinkerTools.materials, 1, 9), 0.5f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreSlag, 1, 4), new ItemStack(TinkerTools.materials, 1, 10), 0.5f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreSlag, 1, 5), new ItemStack(TinkerTools.materials, 1, 11), 0.5f); - - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 0), new ItemStack(TinkerTools.materials, 1, 19), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 1), new ItemStack(Items.gold_nugget), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 2), new ItemStack(TinkerTools.materials, 1, 20), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 3), new ItemStack(TinkerTools.materials, 1, 21), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 4), new ItemStack(TinkerTools.materials, 1, 22), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreSlag, 1, 3), new ItemStack(TinkerTools.materials, 1, 9), 0.5f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreSlag, 1, 4), new ItemStack(TinkerTools.materials, 1, 10), 0.5f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreSlag, 1, 5), new ItemStack(TinkerTools.materials, 1, 11), 0.5f); + + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 0), new ItemStack(TinkerTools.materials, 1, 19), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a(new ItemStack(TinkerWorld.oreBerries, 1, 1), new ItemStack(Items.gold_nugget), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 2), new ItemStack(TinkerTools.materials, 1, 20), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 3), new ItemStack(TinkerTools.materials, 1, 21), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreBerries, 1, 4), new ItemStack(TinkerTools.materials, 1, 22), 0.2f); // FurnaceRecipes.smelting().func_151394_a(new // ItemStack(TRepo.oreBerries, 5, new ItemStack(TRepo.materials, 1, 23), // 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 0), new ItemStack(Items.iron_ingot), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 1), new ItemStack(Items.gold_ingot), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 2), new ItemStack(TinkerTools.materials, 1, 9), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 3), new ItemStack(TinkerTools.materials, 1, 10), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 4), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); - - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 38), new ItemStack(TinkerTools.materials, 1, 4), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 39), new ItemStack(TinkerTools.materials, 1, 3), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 40), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 41), new ItemStack(TinkerTools.materials, 1, 5), 0.2f); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 42), new ItemStack(TinkerTools.materials, 1, 14), 0.2f); - + FurnaceRecipes.smelting() + .func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 0), new ItemStack(Items.iron_ingot), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a(new ItemStack(TinkerWorld.oreGravel, 1, 1), new ItemStack(Items.gold_ingot), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreGravel, 1, 2), new ItemStack(TinkerTools.materials, 1, 9), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreGravel, 1, 3), new ItemStack(TinkerTools.materials, 1, 10), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerWorld.oreGravel, 1, 4), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); + + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.materials, 1, 38), new ItemStack(TinkerTools.materials, 1, 4), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.materials, 1, 39), new ItemStack(TinkerTools.materials, 1, 3), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.materials, 1, 40), new ItemStack(TinkerTools.materials, 1, 11), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.materials, 1, 41), new ItemStack(TinkerTools.materials, 1, 5), 0.2f); + FurnaceRecipes.smelting() + .func_151394_a( + new ItemStack(TinkerTools.materials, 1, 42), new ItemStack(TinkerTools.materials, 1, 14), 0.2f); } - public void oreRegistry () - { + public void oreRegistry() { OreDictionary.registerOre("oreCobalt", new ItemStack(TinkerWorld.oreSlag, 1, 1)); OreDictionary.registerOre("oreArdite", new ItemStack(TinkerWorld.oreSlag, 1, 2)); OreDictionary.registerOre("oreCopper", new ItemStack(TinkerWorld.oreSlag, 1, 3)); @@ -532,44 +924,60 @@ public void oreRegistry () RecipeRemover.removeShapedRecipe(new ItemStack(Items.magma_cream)); RecipeRemover.removeShapedRecipe(new ItemStack(Items.lead)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.sticky_piston), "slimeball", Blocks.piston)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); + GameRegistry.addRecipe( + new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); } - public static void ensureOreIsRegistered (String oreName, ItemStack is) - { + public static void ensureOreIsRegistered(String oreName, ItemStack is) { int oreId = OreDictionary.getOreID(is); - if (oreId == -1) - { + if (oreId == -1) { OreDictionary.registerOre(oreName, is); } } - public void addLoot () - { + public void addLoot() { // Item, min, max, weight - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 10)); TinkerWorld.tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); - TinkerWorld.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 1)); - int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; - Item[] partTypes = { TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead }; - - for (int partIter = 0; partIter < partTypes.length; partIter++) - { - for (int typeIter = 0; typeIter < validTypes.length; typeIter++) - { - TinkerWorld.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); + TinkerWorld.tinkerHouseChest.addItem( + new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 1)); + int[] validTypes = {0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17}; + Item[] partTypes = { + TinkerTools.pickaxeHead, + TinkerTools.shovelHead, + TinkerTools.hatchetHead, + TinkerTools.binding, + TinkerTools.swordBlade, + TinkerTools.wideGuard, + TinkerTools.handGuard, + TinkerTools.crossbar, + TinkerTools.knifeBlade, + TinkerTools.frypanHead, + TinkerTools.signHead, + TinkerTools.chiselHead + }; + + for (int partIter = 0; partIter < partTypes.length; partIter++) { + for (int typeIter = 0; typeIter < validTypes.length; typeIter++) { + TinkerWorld.tinkerHouseChest.addItem(new WeightedRandomChestContent( + new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); } } TinkerWorld.tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); - for (int i = 0; i < 13; i++) - { - TinkerWorld.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, i + 1), 1, 3, 20)); + for (int i = 0; i < 13; i++) { + TinkerWorld.tinkerHousePatterns.addItem( + new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, i + 1), 1, 3, 20)); } - TinkerWorld.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, 22), 1, 3, 40)); + TinkerWorld.tinkerHousePatterns.addItem( + new WeightedRandomChestContent(new ItemStack(TinkerTools.woodPattern, 1, 22), 1, 3, 40)); } } diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java index a5b5f4d0794..fcc255ac56f 100644 --- a/src/main/java/tconstruct/world/TinkerWorldEvents.java +++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java @@ -16,30 +16,24 @@ import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; -public class TinkerWorldEvents -{ +public class TinkerWorldEvents { @SubscribeEvent - public void onLivingSpawn (LivingSpawnEvent.SpecialSpawn event) - { + public void onLivingSpawn(LivingSpawnEvent.SpecialSpawn event) { EntityLivingBase living = event.entityLiving; - if (living.getClass() == EntitySpider.class && TConstruct.random.nextInt(100) == 0) - { + if (living.getClass() == EntitySpider.class && TConstruct.random.nextInt(100) == 0) { EntityCreeper creeper = new EntityCreeper(living.worldObj); spawnEntityLiving(living.posX, living.posY + 1, living.posZ, creeper, living.worldObj); - if (living.riddenByEntity != null) - creeper.mountEntity(living.riddenByEntity); - else - creeper.mountEntity(living); + if (living.riddenByEntity != null) creeper.mountEntity(living.riddenByEntity); + else creeper.mountEntity(living); - EntityXPOrb orb = new EntityXPOrb(living.worldObj, living.posX, living.posY, living.posZ, TConstruct.random.nextInt(20) + 20); + EntityXPOrb orb = new EntityXPOrb( + living.worldObj, living.posX, living.posY, living.posZ, TConstruct.random.nextInt(20) + 20); orb.mountEntity(creeper); } } - public static void spawnEntityLiving (double x, double y, double z, EntityLiving entity, World world) - { - if (!world.isRemote) - { + public static void spawnEntityLiving(double x, double y, double z, EntityLiving entity, World world) { + if (!world.isRemote) { entity.setPosition(x, y, z); entity.onSpawnWithEgg((IEntityLivingData) null); world.spawnEntityInWorld(entity); @@ -48,13 +42,11 @@ public static void spawnEntityLiving (double x, double y, double z, EntityLiving /* Bonemeal */ @SubscribeEvent - public void bonemealEvent (BonemealEvent event) - { - if (!event.world.isRemote) - { - if (event.block == TinkerWorld.slimeSapling) - { - if (TinkerWorld.slimeSapling.boneFertilize(event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer)) + public void bonemealEvent(BonemealEvent event) { + if (!event.world.isRemote) { + if (event.block == TinkerWorld.slimeSapling) { + if (TinkerWorld.slimeSapling.boneFertilize( + event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer)) event.setResult(Event.Result.ALLOW); } } @@ -62,40 +54,30 @@ public void bonemealEvent (BonemealEvent event) /* Damage */ @SubscribeEvent - public void onHurt (LivingHurtEvent event) - { + public void onHurt(LivingHurtEvent event) { EntityLivingBase reciever = event.entityLiving; - if (reciever instanceof EntityPlayer) - { + if (reciever instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entityLiving; // Cutlass ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && player.isUsingItem()) - { + if (stack != null && player.isUsingItem()) { Item item = stack.getItem(); - if (item == TinkerTools.cutlass) - { + if (item == TinkerTools.cutlass) { player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 3 * 20, 1)); - } - else if (item == TinkerTools.battlesign) - { - event.ammount *= 1.5; //Puts battlesign blocking at 3/4 instead of 1/2 + } else if (item == TinkerTools.battlesign) { + event.ammount *= 1.5; // Puts battlesign blocking at 3/4 instead of 1/2 } } - } - else if (reciever instanceof EntityCreeper) - { + } else if (reciever instanceof EntityCreeper) { Entity attacker = event.source.getEntity(); - if (attacker instanceof EntityLivingBase) - { + if (attacker instanceof EntityLivingBase) { Entity target = ((EntityCreeper) reciever).getAttackTarget(); - if (target != null) - { + if (target != null) { float d1 = reciever.getDistanceToEntity(((EntityCreeper) reciever).getAttackTarget()); float d2 = reciever.getDistanceToEntity(attacker); - if (d2 < d1) - { - ((EntityCreeper) event.entityLiving).setAttackTarget((EntityLivingBase) event.source.getEntity()); + if (d2 < d1) { + ((EntityCreeper) event.entityLiving) + .setAttackTarget((EntityLivingBase) event.source.getEntity()); } } } @@ -103,25 +85,17 @@ else if (reciever instanceof EntityCreeper) } @SubscribeEvent - public void onLivingDrop (LivingDropsEvent event) - { - if (event.entityLiving == null) - return; + public void onLivingDrop(LivingDropsEvent event) { + if (event.entityLiving == null) return; - if (event.entityLiving.getClass() == EntityGhast.class) - { - if (PHConstruct.uhcGhastDrops) - { - for (EntityItem o : event.drops) - { - if (o.getEntityItem().getItem() == Items.ghast_tear) - { + if (event.entityLiving.getClass() == EntityGhast.class) { + if (PHConstruct.uhcGhastDrops) { + for (EntityItem o : event.drops) { + if (o.getEntityItem().getItem() == Items.ghast_tear) { o.setEntityItemStack(new ItemStack(Items.gold_ingot, 1)); } } - } - else - { + } else { ItemHelper.addDrops(event, new ItemStack(Items.ghast_tear, 1)); } } diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index 111ea8928bd..364396d7109 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -15,18 +15,15 @@ import tconstruct.world.entity.*; import tconstruct.world.model.*; -public class TinkerWorldProxyClient extends TinkerWorldProxyCommon -{ +public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { @Override - public void initialize () - { + public void initialize() { registerRenderer(); registerManualIcons(); registerManualRecipes(); } - void registerRenderer () - { + void registerRenderer() { RenderingRegistry.registerBlockHandler(new OreberryRender()); RenderingRegistry.registerBlockHandler(new BarricadeRender()); RenderingRegistry.registerBlockHandler(new RenderLandmine()); @@ -40,16 +37,13 @@ void registerRenderer () RenderingRegistry.registerEntityRenderingHandler(KingBlueSlime.class, slimeRender); RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); - VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); + VillagerRegistry.instance() + .registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); } - void registerManualIcons () - { + void registerManualIcons() {} - } - - void registerManualRecipes () - { + void registerManualRecipes() { ItemStack netherrack = new ItemStack(Blocks.netherrack); ItemStack coal = new ItemStack(Items.coal); ItemStack log = new ItemStack(Blocks.log, 1, 0); @@ -57,38 +51,54 @@ void registerManualRecipes () ItemStack graveyardsoil = new ItemStack(TinkerTools.craftedSoil, 1, 3); ItemStack consecratedsoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); - MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null); - MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimeChannel), new ItemStack(Items.slime_ball), null, null); - - MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Blocks.dirt), new ItemStack(Items.rotten_flesh), new ItemStack(Items.dye, 1, 15), null); + MantleClientRegistry.registerManualSmallRecipe( + "slimechannel", + new ItemStack(TinkerWorld.slimeChannel, 1, 0), + new ItemStack(TinkerWorld.slimeGel, 1, 0), + new ItemStack(Items.redstone), + null, + null); + MantleClientRegistry.registerManualSmallRecipe( + "bouncepad", + new ItemStack(TinkerWorld.slimePad, 1, 0), + new ItemStack(TinkerWorld.slimeChannel), + new ItemStack(Items.slime_ball), + null, + null); + + MantleClientRegistry.registerManualSmallRecipe( + "graveyardsoil", + graveyardsoil, + new ItemStack(Blocks.dirt), + new ItemStack(Items.rotten_flesh), + new ItemStack(Items.dye, 1, 15), + null); MantleClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil); // Traps ItemStack reed = new ItemStack(Items.reeds); - MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TinkerWorld.punji, 5), reed, null, reed, null, reed, null, reed, null, reed); - MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); - + MantleClientRegistry.registerManualLargeRecipe( + "punji", new ItemStack(TinkerWorld.punji, 5), reed, null, reed, null, reed, null, reed, null, reed); + MantleClientRegistry.registerManualSmallRecipe( + "barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); } Minecraft mc = Minecraft.getMinecraft(); @Override - public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) - { + public void spawnParticle( + String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) { this.doSpawnParticle(particle, xPos, yPos, zPos, velX, velY, velZ); } - public EntityFX doSpawnParticle (String par1Str, double par2, double par4, double par6, double par8, double par10, double par12) - { - if (this.mc == null) - this.mc = Minecraft.getMinecraft(); + public EntityFX doSpawnParticle( + String par1Str, double par2, double par4, double par6, double par8, double par10, double par12) { + if (this.mc == null) this.mc = Minecraft.getMinecraft(); - if (this.mc.renderViewEntity != null && this.mc.effectRenderer != null) - { + if (this.mc.renderViewEntity != null && this.mc.effectRenderer != null) { int i = this.mc.gameSettings.particleSetting; - if (i == 1 && mc.theWorld.rand.nextInt(3) == 0) - { + if (i == 1 && mc.theWorld.rand.nextInt(3) == 0) { i = 2; } @@ -97,180 +107,112 @@ public EntityFX doSpawnParticle (String par1Str, double par2, double par4, doubl double d8 = this.mc.renderViewEntity.posZ - par6; EntityFX entityfx = null; - if (par1Str.equals("hugeexplosion")) - { - this.mc.effectRenderer.addEffect(entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12)); - } - else if (par1Str.equals("largeexplode")) - { - this.mc.effectRenderer.addEffect(entityfx = new EntityLargeExplodeFX(mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12)); - } - else if (par1Str.equals("fireworksSpark")) - { - this.mc.effectRenderer.addEffect(entityfx = new EntityFireworkSparkFX(mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer)); + if (par1Str.equals("hugeexplosion")) { + this.mc.effectRenderer.addEffect( + entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12)); + } else if (par1Str.equals("largeexplode")) { + this.mc.effectRenderer.addEffect( + entityfx = new EntityLargeExplodeFX( + mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12)); + } else if (par1Str.equals("fireworksSpark")) { + this.mc.effectRenderer.addEffect( + entityfx = new EntityFireworkSparkFX( + mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer)); } - if (entityfx != null) - { + if (entityfx != null) { return (EntityFX) entityfx; - } - else - { + } else { double d9 = 16.0D; - if (d6 * d6 + d7 * d7 + d8 * d8 > d9 * d9) - { + if (d6 * d6 + d7 * d7 + d8 * d8 > d9 * d9) { return null; - } - else if (i > 1) - { + } else if (i > 1) { return null; - } - else - { - if (par1Str.equals("bubble")) - { + } else { + if (par1Str.equals("bubble")) { entityfx = new EntityBubbleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("suspended")) - { + } else if (par1Str.equals("suspended")) { entityfx = new EntitySuspendFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("depthsuspend")) - { + } else if (par1Str.equals("depthsuspend")) { entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("townaura")) - { + } else if (par1Str.equals("townaura")) { entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("crit")) - { + } else if (par1Str.equals("crit")) { entityfx = new EntityCritFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("smoke")) - { + } else if (par1Str.equals("smoke")) { entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("mobSpell")) - { + } else if (par1Str.equals("mobSpell")) { entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); - } - else if (par1Str.equals("mobSpellAmbient")) - { + } else if (par1Str.equals("mobSpellAmbient")) { entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); ((EntityFX) entityfx).setAlphaF(0.15F); ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); - } - else if (par1Str.equals("spell")) - { + } else if (par1Str.equals("spell")) { entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("instantSpell")) - { + } else if (par1Str.equals("instantSpell")) { entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); - } - else if (par1Str.equals("witchMagic")) - { + } else if (par1Str.equals("witchMagic")) { entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F; ((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f); - } - else if (par1Str.equals("note")) - { + } else if (par1Str.equals("note")) { entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("portal")) - { + } else if (par1Str.equals("portal")) { entityfx = new EntityPortalFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("enchantmenttable")) - { - entityfx = new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("explode")) - { + } else if (par1Str.equals("enchantmenttable")) { + entityfx = + new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } else if (par1Str.equals("explode")) { entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("flame")) - { + } else if (par1Str.equals("flame")) { entityfx = new EntityFlameFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("lava")) - { + } else if (par1Str.equals("lava")) { entityfx = new EntityLavaFX(mc.theWorld, par2, par4, par6); - } - else if (par1Str.equals("footstep")) - { + } else if (par1Str.equals("footstep")) { entityfx = new EntityFootStepFX(mc.renderEngine, mc.theWorld, par2, par4, par6); - } - else if (par1Str.equals("splash")) - { + } else if (par1Str.equals("splash")) { entityfx = new EntitySplashFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("largesmoke")) - { + } else if (par1Str.equals("largesmoke")) { entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12, 2.5F); - } - else if (par1Str.equals("cloud")) - { + } else if (par1Str.equals("cloud")) { entityfx = new EntityCloudFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("reddust")) - { - entityfx = new EntityReddustFX(mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12); - } - else if (par1Str.equals("snowballpoof")) - { + } else if (par1Str.equals("reddust")) { + entityfx = new EntityReddustFX( + mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12); + } else if (par1Str.equals("snowballpoof")) { entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Items.snowball); - } - else if (par1Str.equals("dripWater")) - { + } else if (par1Str.equals("dripWater")) { entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water); - } - else if (par1Str.equals("dripLava")) - { + } else if (par1Str.equals("dripLava")) { entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava); - } - else if (par1Str.equals("snowshovel")) - { + } else if (par1Str.equals("snowshovel")) { entityfx = new EntitySnowShovelFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("blueslime")) - { + } else if (par1Str.equals("blueslime")) { entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TinkerWorld.strangeFood); - } - else if (par1Str.equals("heart")) - { + } else if (par1Str.equals("heart")) { entityfx = new EntityHeartFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - } - else if (par1Str.equals("angryVillager")) - { + } else if (par1Str.equals("angryVillager")) { entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12); ((EntityFX) entityfx).setParticleTextureIndex(81); ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); - } - else if (par1Str.equals("happyVillager")) - { + } else if (par1Str.equals("happyVillager")) { entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); ((EntityFX) entityfx).setParticleTextureIndex(82); ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); } - if (entityfx != null) - { + if (entityfx != null) { this.mc.effectRenderer.addEffect((EntityFX) entityfx); } return (EntityFX) entityfx; } } - } - else - { + } else { return null; } } diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java b/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java index cef7476b1b1..4b9dccaf277 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java @@ -1,16 +1,9 @@ package tconstruct.world; -public class TinkerWorldProxyCommon -{ +public class TinkerWorldProxyCommon { - public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) - { - - } - - public void initialize () - { - - } + public void spawnParticle( + String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) {} + public void initialize() {} } diff --git a/src/main/java/tconstruct/world/blocks/ConveyorBase.java b/src/main/java/tconstruct/world/blocks/ConveyorBase.java index ad04790d264..e64eefe39e3 100644 --- a/src/main/java/tconstruct/world/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/world/blocks/ConveyorBase.java @@ -12,94 +12,85 @@ import tconstruct.library.TConstructRegistry; import tconstruct.world.model.SlimeChannelRender; -public class ConveyorBase extends MantleBlock -{ +public class ConveyorBase extends MantleBlock { String texturename; - public ConveyorBase(Material material, String name) - { + public ConveyorBase(Material material, String name) { super(material); this.setCreativeTab(TConstructRegistry.blockTab); setBlockBounds(0f, 0f, 0f, 1f, 0.5f, 1f); texturename = name; } - public boolean isBlockReplaceable (World world, int x, int y, int z) - { + public boolean isBlockReplaceable(World world, int x, int y, int z) { return false; } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (!world.isBlockIndirectlyGettingPowered(x, y, z)) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isBlockIndirectlyGettingPowered(x, y, z)) { double moveX = 0; double moveZ = 0; double speed = 0.01; int meta = world.getBlockMetadata(x, y, z); - switch (meta % 8) - { - case 6: - moveX += speed; - break; - case 7: - moveX += speed; - moveZ += speed; - break; - case 0: - moveZ += speed; - break; - case 1: - moveZ += speed; - moveX -= speed; - break; - case 2: - moveX -= speed; - break; - case 3: - moveX -= speed; - moveZ -= speed; - break; - case 4: - moveZ -= speed; - break; - case 5: - moveZ -= speed; - moveX += speed; - break; + switch (meta % 8) { + case 6: + moveX += speed; + break; + case 7: + moveX += speed; + moveZ += speed; + break; + case 0: + moveZ += speed; + break; + case 1: + moveZ += speed; + moveX -= speed; + break; + case 2: + moveX -= speed; + break; + case 3: + moveX -= speed; + moveZ -= speed; + break; + case 4: + moveZ -= speed; + break; + case 5: + moveZ -= speed; + moveX += speed; + break; } entity.addVelocity(moveX, 0, moveZ); } - if (entity instanceof EntityItem) - { + if (entity instanceof EntityItem) { ((EntityItem) entity).age = 0; } } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) - { - int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + (entity.isSneaking() ? 4 : 0) & 7; + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + + (entity.isSneaking() ? 4 : 0) + & 7; int meta = world.getBlockMetadata(x, y, z) & 8; world.setBlockMetadataWithNotify(x, y, z, face | meta, 2); } @Override - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) - { - if (side == 1) - return false; + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { + if (side == 1) return false; return super.shouldSideBeRendered(world, x, y, z, side); } @@ -107,47 +98,39 @@ public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, in /* Rendering */ @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 1; } @Override - public int getRenderType () - { + public int getRenderType() { return SlimeChannelRender.model; } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { - String[] textureNames = new String[] { texturename, texturename + "_flow" }; + public void registerBlockIcons(IIconRegister iconRegister) { + String[] textureNames = new String[] {texturename, texturename + "_flow"}; this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta >= 8) - return icons[0]; + public IIcon getIcon(int side, int meta) { + if (meta >= 8) return icons[0]; return side == 1 ? icons[1] : icons[0]; } } diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java index 37937fb48ae..73ac31342b5 100644 --- a/src/main/java/tconstruct/world/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -12,69 +12,56 @@ import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; -public class GravelOre extends BlockSand -{ - public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; +public class GravelOre extends BlockSand { + public String[] textureNames = new String[] {"iron", "gold", "copper", "tin", "aluminum", "cobalt"}; public IIcon[] icons; - public GravelOre() - { + public GravelOre() { this.blockMaterial = Material.craftedSnow; this.setCreativeTab(TConstructRegistry.blockTab); this.setStepSound(soundTypeGravel); } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:ore_" + textureNames[i] + "_gravel"); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - if (meta >= textureNames.length) - return icons[0]; + public IIcon getIcon(int side, int meta) { + if (meta >= textureNames.length) return icons[0]; return icons[meta]; } - public float getBlockHardness (World world, int x, int y, int z) - { + public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 5) - return 10f; - else - return 3f; + if (meta == 5) return 10f; + else return 3f; } @Override - public int damageDropped (int meta) - { + public int damageDropped(int meta) { /*if (meta == 1) - return 0;*/ + return 0;*/ return meta; } @Override - public Item getItemDropped (int par1, Random par2Random, int par3) - { + public Item getItemDropped(int par1, Random par2Random, int par3) { /*if (par1 == 1) - return Item.goldNugget.itemID;*/ + return Item.goldNugget.itemID;*/ return Item.getItemFromBlock(TinkerWorld.oreGravel); } @Override - public void getSubBlocks (Item id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 6; iter++) - { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int iter = 0; iter < 6; iter++) { list.add(new ItemStack(id, 1, iter)); } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/world/blocks/MeatBlock.java b/src/main/java/tconstruct/world/blocks/MeatBlock.java index b950d182ff2..aa8d62218a4 100644 --- a/src/main/java/tconstruct/world/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/world/blocks/MeatBlock.java @@ -10,13 +10,11 @@ import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; -public class MeatBlock extends BlockWood -{ +public class MeatBlock extends BlockWood { public IIcon[] icons; - public String[] textureNames = new String[] { "ham_skin", "ham_bone" }; + public String[] textureNames = new String[] {"ham_skin", "ham_bone"}; - public MeatBlock() - { + public MeatBlock() { this.setHardness(1.0F); this.setStepSound(Block.soundTypeWood); // setBurnProperties(this.blockID, 5, 20); @@ -25,26 +23,22 @@ public MeatBlock() @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int metadata) - { + public IIcon getIcon(int side, int metadata) { int tex = (metadata % 4) * 2; int orientation = metadata / 4; switch (orientation) // Ends of logs { - case 0: - if (side == 0 || side == 1) - return icons[tex + 1]; - break; - case 1: - if (side == 4 || side == 5) - return icons[tex + 1]; - break; - case 2: - if (side == 2 || side == 3) - return icons[tex + 1]; - break; + case 0: + if (side == 0 || side == 1) return icons[tex + 1]; + break; + case 1: + if (side == 4 || side == 5) return icons[tex + 1]; + break; + case 2: + if (side == 2 || side == 3) return icons[tex + 1]; + break; } return icons[tex]; @@ -52,19 +46,16 @@ public IIcon getIcon (int side, int metadata) @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } @Override - public Item getItemDropped (int par1, Random par2Random, int par3) - { + public Item getItemDropped(int par1, Random par2Random, int par3) { return new ItemStack(this).getItem(); } @@ -72,23 +63,17 @@ public Item getItemDropped (int par1, Random par2Random, int par3) * ejects contained items into the world, and notifies neighbours of an * update, as appropriate */ - public void breakBlock (World par1World, int par2, int par3, int par4, int par5, int par6) - { + public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) { byte b0 = 4; int j1 = b0 + 1; - if (par1World.checkChunksExist(par2 - j1, par3 - j1, par4 - j1, par2 + j1, par3 + j1, par4 + j1)) - { - for (int k1 = -b0; k1 <= b0; ++k1) - { - for (int l1 = -b0; l1 <= b0; ++l1) - { - for (int i2 = -b0; i2 <= b0; ++i2) - { + if (par1World.checkChunksExist(par2 - j1, par3 - j1, par4 - j1, par2 + j1, par3 + j1, par4 + j1)) { + for (int k1 = -b0; k1 <= b0; ++k1) { + for (int l1 = -b0; l1 <= b0; ++l1) { + for (int i2 = -b0; i2 <= b0; ++i2) { Block j2 = par1World.getBlock(par2 + k1, par3 + l1, par4 + i2); - if (j2 != null) - { + if (j2 != null) { j2.beginLeavesDecay(par1World, par2 + k1, par3 + l1, par4 + i2); } } @@ -102,24 +87,23 @@ public void breakBlock (World par1World, int par2, int par3, int par4, int par5, * side, hitX, hitY, hitZ, block metadata */ @Override - public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) - { + public int onBlockPlaced( + World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { int j1 = par9 & 3; byte b0 = 0; - switch (par5) - { - case 0: - case 1: - b0 = 0; - break; - case 2: - case 3: - b0 = 8; - break; - case 4: - case 5: - b0 = 4; + switch (par5) { + case 0: + case 1: + b0 = 0; + break; + case 2: + case 3: + b0 = 8; + break; + case 4: + case 5: + b0 = 4; } return j1 | b0; @@ -130,27 +114,23 @@ public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par * wood. */ @Override - public int damageDropped (int par1) - { + public int damageDropped(int par1) { return par1 & 3; } /** * returns a number between 0 and 3 */ - public static int limitToValidMetadata (int par0) - { + public static int limitToValidMetadata(int par0) { return par0 & 3; } @Override - protected ItemStack createStackedBlock (int par1) - { + protected ItemStack createStackedBlock(int par1) { return new ItemStack(this, 1, limitToValidMetadata(par1)); } - public boolean isBlockReplaceable (World world, int x, int y, int z) - { + public boolean isBlockReplaceable(World world, int x, int y, int z) { return false; } @@ -163,15 +143,12 @@ public boolean isBlockReplaceable (World world, int x, int y, int z) @SideOnly(Side.CLIENT) @Override - public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List) - { - for (int i = 0; i < icons.length / 2; i++) - par3List.add(new ItemStack(b, 1, i)); + public void getSubBlocks(Item b, CreativeTabs par2CreativeTabs, List par3List) { + for (int i = 0; i < icons.length / 2; i++) par3List.add(new ItemStack(b, 1, i)); } @Override - public boolean isBeaconBase (IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) - { + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { return true; } } diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java index ce6cecfb82f..72ea6a8e95f 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -15,14 +15,12 @@ import net.minecraft.world.*; import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.model.OreberryRender; -public class OreberryBush extends BlockLeavesBase implements IPlantable -{ +public class OreberryBush extends BlockLeavesBase implements IPlantable { Random random; public IIcon[] fastIcons; public IIcon[] fancyIcons; @@ -31,8 +29,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable public int itemMeat; private int subitems; - public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes) - { + public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes) { super(Material.leaves, false); this.textureNames = textureNames; this.itemMeat = meta; @@ -49,15 +46,12 @@ public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes) @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; - for (int i = 0; i < this.fastIcons.length; i++) - { - if (textureNames[i] != "") - { + for (int i = 0; i < this.fastIcons.length; i++) { + if (textureNames[i] != "") { this.fastIcons[i] = iconRegister.registerIcon("tinker:crops/" + textureNames[i] + "_fast"); this.fancyIcons[i] = iconRegister.registerIcon("tinker:crops/" + textureNames[i] + "_fancy"); } @@ -65,28 +59,18 @@ public void registerBlockIcons (IIconRegister iconRegister) } @Override - public IIcon getIcon (int side, int metadata) - { + public IIcon getIcon(int side, int metadata) { this.setGraphicsLevel(Minecraft.getMinecraft().gameSettings.fancyGraphics); - if (field_150121_P) - { - if (metadata < 12) - { + if (field_150121_P) { + if (metadata < 12) { return fancyIcons[metadata % 4]; - } - else - { + } else { return fancyIcons[metadata % 4 + 4]; } - } - else - { - if (metadata < 12) - { + } else { + if (metadata < 12) { return fastIcons[metadata % 4]; - } - else - { + } else { return fastIcons[metadata % 4 + 4]; } } @@ -94,51 +78,62 @@ public IIcon getIcon (int side, int metadata) /* Bushes are stored by size then type */ @Override - public int damageDropped (int metadata) - { + public int damageDropped(int metadata) { return metadata % 4; } /* The following methods define a berry bush's size depending on metadata */ @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int l = world.getBlockMetadata(x, y, z); - if (l < 4) - { - return AxisAlignedBB.getBoundingBox((double) x + 0.25D, y, (double) z + 0.25D, (double) x + 0.75D, (double) y + 0.5D, (double) z + 0.75D); - } - else if (l < 8) - { - return AxisAlignedBB.getBoundingBox((double) x + 0.125D, y, (double) z + 0.125D, (double) x + 0.875D, (double) y + 0.75D, (double) z + 0.875D); - } - else - { - return AxisAlignedBB.getBoundingBox(x + 0.0625, y, z + 0.0625, (double) x + 0.9375D, (double) y + 0.9375D, (double) z + 0.9375D); + if (l < 4) { + return AxisAlignedBB.getBoundingBox( + (double) x + 0.25D, + y, + (double) z + 0.25D, + (double) x + 0.75D, + (double) y + 0.5D, + (double) z + 0.75D); + } else if (l < 8) { + return AxisAlignedBB.getBoundingBox( + (double) x + 0.125D, + y, + (double) z + 0.125D, + (double) x + 0.875D, + (double) y + 0.75D, + (double) z + 0.875D); + } else { + return AxisAlignedBB.getBoundingBox( + x + 0.0625, y, z + 0.0625, (double) x + 0.9375D, (double) y + 0.9375D, (double) z + 0.9375D); } } @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { int l = world.getBlockMetadata(x, y, z); - if (l < 4) - { - return AxisAlignedBB.getBoundingBox((double) x + 0.25D, y, (double) z + 0.25D, (double) x + 0.75D, (double) y + 0.5D, (double) z + 0.75D); - } - else if (l < 8) - { - return AxisAlignedBB.getBoundingBox((double) x + 0.125D, y, (double) z + 0.125D, (double) x + 0.875D, (double) y + 0.75D, (double) z + 0.875D); - } - else - { + if (l < 4) { + return AxisAlignedBB.getBoundingBox( + (double) x + 0.25D, + y, + (double) z + 0.25D, + (double) x + 0.75D, + (double) y + 0.5D, + (double) z + 0.75D); + } else if (l < 8) { + return AxisAlignedBB.getBoundingBox( + (double) x + 0.125D, + y, + (double) z + 0.125D, + (double) x + 0.875D, + (double) y + 0.75D, + (double) z + 0.875D); + } else { return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 1.0D, (double) z + 1.0D); } } @Override - public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int x, int y, int z) - { + public void setBlockBoundsBasedOnState(IBlockAccess iblockaccess, int x, int y, int z) { int md = iblockaccess.getBlockMetadata(x, y, z); float minX; @@ -148,23 +143,15 @@ public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int x, int y, float maxY; float maxZ; - if (md < 4) - { + if (md < 4) { minX = minZ = 0.25F; maxX = maxZ = 0.75F; maxY = 0.5F; - } - else - - if (md < 8) - { + } else if (md < 8) { minX = minZ = 0.125F; maxX = maxZ = 0.875F; maxY = 0.75F; - } - - else - { + } else { minX = minZ = 0.0F; maxX = maxZ = 1.0F; maxY = 1.0F; @@ -174,28 +161,25 @@ public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int x, int y, /* Left-click harvests berries */ @Override - public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player) - { - harvest(world, x,y,z, player); + public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { + harvest(world, x, y, z, player); } /* Right-click harvests berries */ @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) - { - return harvest(world, x,y,z, player); + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + return harvest(world, x, y, z, player); } - public boolean harvest(World world, int x, int y, int z, EntityPlayer player) - { + public boolean harvest(World world, int x, int y, int z, EntityPlayer player) { int meta = world.getBlockMetadata(x, y, z); - if (meta >= 12) - { - if (world.isRemote) - return true; + if (meta >= 12) { + if (world.isRemote) return true; world.setBlock(x, y, z, this, meta - 4, 3); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TinkerWorld.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); + AbilityHelper.spawnItemAtPlayer( + player, new ItemStack(TinkerWorld.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); } return false; @@ -204,37 +188,29 @@ public boolean harvest(World world, int x, int y, int z, EntityPlayer player) /* Render logic */ @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } - public void setGraphicsLevel (boolean flag) - { + public void setGraphicsLevel(boolean flag) { field_150121_P = flag; } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public int getRenderType () - { + public int getRenderType() { return OreberryRender.model; } @Override - public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, int z, int meta) - { - if (meta > 7 || field_150121_P) - { + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int x, int y, int z, int meta) { + if (meta > 7 || field_150121_P) { return super.shouldSideBeRendered(iblockaccess, x, y, z, meta); - } - else - { + } else { return true; } } @@ -242,20 +218,16 @@ public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, in /* Bush growth */ @Override - public void updateTick (World world, int x, int y, int z, Random random1) - { - if (world.isRemote) - { + public void updateTick(World world, int x, int y, int z, Random random1) { + if (world.isRemote) { return; } - if (random1.nextInt(20) == 0)// && world.getBlockLightValue(x, y, z) <= 8) + if (random1.nextInt(20) == 0) // && world.getBlockLightValue(x, y, z) <= 8) { - if (world.getFullBlockLightValue(x, y, z) < 10) - { + if (world.getFullBlockLightValue(x, y, z) < 10) { int meta = world.getBlockMetadata(x, y, z); - if (meta < 12) - { + if (meta < 12) { world.setBlock(x, y, z, this, meta + 4, 3); } } @@ -266,18 +238,14 @@ public void updateTick (World world, int x, int y, int z, Random random1) } } - public boolean canSustainPlant (World world, int x, int y, int z, ForgeDirection direction, IPlantable plant) - { - if (plant instanceof OreberryBush) - return (world.getBlockMetadata(x, y, z) > 7); + public boolean canSustainPlant(World world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { + if (plant instanceof OreberryBush) return (world.getBlockMetadata(x, y, z) > 7); return super.canSustainPlant(world, x, y, z, direction, plant); } @Override - public boolean canPlaceBlockAt (World world, int x, int y, int z) - { - if (world.getFullBlockLightValue(x, y, z) < 13) - return super.canPlaceBlockAt(world, x, y, z); + public boolean canPlaceBlockAt(World world, int x, int y, int z) { + if (world.getFullBlockLightValue(x, y, z) < 13) return super.canPlaceBlockAt(world, x, y, z); return false; } @@ -288,36 +256,29 @@ public boolean canPlaceBlockAt (World world, int x, int y, int z) */ @SideOnly(Side.CLIENT) @Override - public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3List) - { - for (int var4 = 8; var4 < 8 + subitems; ++var4) - { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int var4 = 8; var4 < 8 + subitems; ++var4) { par3List.add(new ItemStack(par1, 1, var4)); } } @Override - public EnumPlantType getPlantType (IBlockAccess world, int x, int y, int z) - { + public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) { return EnumPlantType.Cave; } @Override - public Block getPlant (IBlockAccess world, int x, int y, int z) - { + public Block getPlant(IBlockAccess world, int x, int y, int z) { return this; } @Override - public int getPlantMetadata (IBlockAccess world, int x, int y, int z) - { + public int getPlantMetadata(IBlockAccess world, int x, int y, int z) { return world.getBlockMetadata(x, y, z) - 4; } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (!(entity instanceof EntityItem)) - entity.attackEntityFrom(DamageSource.cactus, 1); + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!(entity instanceof EntityItem)) entity.attackEntityFrom(DamageSource.cactus, 1); } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java index 20d10cfd4e9..7221cc1423e 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java @@ -5,31 +5,25 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; -public class OreberryBushEssence extends OreberryBush implements IPlantable -{ - public OreberryBushEssence(String[] textureNames, int meta, int sub, String[] oreTypes) - { +public class OreberryBushEssence extends OreberryBush implements IPlantable { + public OreberryBushEssence(String[] textureNames, int meta, int sub, String[] oreTypes) { super(textureNames, meta, sub, oreTypes); } /* Bush growth */ @Override - public void updateTick (World world, int x, int y, int z, Random random1) - { - if (world.isRemote) - { + public void updateTick(World world, int x, int y, int z, Random random1) { + if (world.isRemote) { return; } - if (random1.nextInt(20) == 0)// && world.getBlockLightValue(x, y, z) <= - // 8) + if (random1.nextInt(20) == 0) // && world.getBlockLightValue(x, y, z) <= + // 8) { int meta = world.getBlockMetadata(x, y, z); - if (world.getFullBlockLightValue(x, y, z) < 10 || meta % 4 == 1) - { - if (meta < 12) - { + if (world.getFullBlockLightValue(x, y, z) < 10 || meta % 4 == 1) { + if (meta < 12) { world.setBlock(x, y, z, (Block) this, meta + 4, 3); } } @@ -41,8 +35,7 @@ public void updateTick (World world, int x, int y, int z, Random random1) } @Override - public boolean canPlaceBlockAt (World world, int x, int y, int z) - { + public boolean canPlaceBlockAt(World world, int x, int y, int z) { return true; /* * if (world.getFullBlockLightValue(x, y, z) < 13) return diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index e55617a002b..4a87ee1fe39 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -16,20 +16,16 @@ import tconstruct.blocks.TConstructBlock; import tconstruct.mechworks.entity.item.ExplosivePrimed; -public class SlimeExplosive extends TConstructBlock -{ +public class SlimeExplosive extends TConstructBlock { - public SlimeExplosive() - { + public SlimeExplosive() { super(Material.tnt, 0f, getTextureNames()); } - static String[] getTextureNames () - { + static String[] getTextureNames() { String[] names = new String[6]; - String[] types = new String[] { "green", "blue" }; - for (int i = 0; i < 2; i++) - { + String[] types = new String[] {"green", "blue"}; + for (int i = 0; i < 2; i++) { names[i * 3 + 0] = "sdx_bottom_" + types[i]; names[i * 3 + 1] = "sdx_side_" + types[i]; names[i * 3 + 2] = "sdx_top_" + types[i]; @@ -39,66 +35,64 @@ static String[] getTextureNames () @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return icons[(meta / 2) * 3 + getSideTextureIndex(side)]; } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 2; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < 2; iter++) { list.add(new ItemStack(b, 1, iter * 2)); } } @Override - public void onBlockAdded (World par1World, int par2, int par3, int par4) - { + public void onBlockAdded(World par1World, int par2, int par3, int par4) { super.onBlockAdded(par1World, par2, par3, par4); - if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) - { + if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) { this.onBlockDestroyedByPlayer(par1World, par2, par3, par4, 1); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } @Override - public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5Block) - { - if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) - { + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5Block) { + if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) { this.onBlockDestroyedByPlayer(par1World, par2, par3, par4, 1); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } @Override - public void onBlockDestroyedByExplosion (World par1World, int par2, int par3, int par4, Explosion par5Explosion) - { - if (!par1World.isRemote) - { - ExplosivePrimed entitytntprimed = new ExplosivePrimed(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 0.5F), (double) ((float) par4 + 0.5F), par5Explosion.getExplosivePlacedBy()); + public void onBlockDestroyedByExplosion(World par1World, int par2, int par3, int par4, Explosion par5Explosion) { + if (!par1World.isRemote) { + ExplosivePrimed entitytntprimed = new ExplosivePrimed( + par1World, + (double) ((float) par2 + 0.5F), + (double) ((float) par3 + 0.5F), + (double) ((float) par4 + 0.5F), + par5Explosion.getExplosivePlacedBy()); entitytntprimed.fuse = par1World.rand.nextInt(entitytntprimed.fuse / 4) + entitytntprimed.fuse / 8; par1World.spawnEntityInWorld(entitytntprimed); } } @Override - public void onBlockDestroyedByPlayer (World par1World, int par2, int par3, int par4, int par5) - { + public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) { this.primeTnt(par1World, par2, par3, par4, par5, (EntityLivingBase) null); } - public void primeTnt (World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) - { - if (!par1World.isRemote) - { - if ((par5 % 2) == 1) - { - ExplosivePrimed entitytntprimed = new ExplosivePrimed(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 0.5F), (double) ((float) par4 + 0.5F), par6EntityLivingBase); + public void primeTnt( + World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) { + if (!par1World.isRemote) { + if ((par5 % 2) == 1) { + ExplosivePrimed entitytntprimed = new ExplosivePrimed( + par1World, + (double) ((float) par2 + 0.5F), + (double) ((float) par3 + 0.5F), + (double) ((float) par4 + 0.5F), + par6EntityLivingBase); par1World.spawnEntityInWorld(entitytntprimed); par1World.playSoundAtEntity(entitytntprimed, "random.fuse", 1.0F, 1.0F); } @@ -106,40 +100,49 @@ public void primeTnt (World par1World, int par2, int par3, int par4, int par5, E } @Override - public boolean onBlockActivated (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) - { - if (par5EntityPlayer.getCurrentEquippedItem() != null && par5EntityPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel) - { + public boolean onBlockActivated( + World par1World, + int par2, + int par3, + int par4, + EntityPlayer par5EntityPlayer, + int par6, + float par7, + float par8, + float par9) { + if (par5EntityPlayer.getCurrentEquippedItem() != null + && par5EntityPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel) { this.primeTnt(par1World, par2, par3, par4, 1, par5EntityPlayer); WorldHelper.setBlockToAir(par1World, par2, par3, par4); par5EntityPlayer.getCurrentEquippedItem().damageItem(1, par5EntityPlayer); return true; - } - else - { + } else { return super.onBlockActivated(par1World, par2, par3, par4, par5EntityPlayer, par6, par7, par8, par9); } } @Override - public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity) - { - if (par5Entity instanceof EntityArrow && !par1World.isRemote) - { + public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { + if (par5Entity instanceof EntityArrow && !par1World.isRemote) { EntityArrow entityarrow = (EntityArrow) par5Entity; - if (entityarrow.isBurning()) - { - this.primeTnt(par1World, par2, par3, par4, 1, entityarrow.shootingEntity instanceof EntityLivingBase ? (EntityLivingBase) entityarrow.shootingEntity : null); + if (entityarrow.isBurning()) { + this.primeTnt( + par1World, + par2, + par3, + par4, + 1, + entityarrow.shootingEntity instanceof EntityLivingBase + ? (EntityLivingBase) entityarrow.shootingEntity + : null); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } } @Override - public boolean canDropFromExplosion (Explosion par1Explosion) - { + public boolean canDropFromExplosion(Explosion par1Explosion) { return false; } - } diff --git a/src/main/java/tconstruct/world/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java index 7bec1fbc276..01ba3e619e2 100644 --- a/src/main/java/tconstruct/world/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -13,133 +13,123 @@ import tconstruct.world.TinkerWorld; import tconstruct.world.model.SlimePadRender; -public class SlimePad extends MantleBlock -{ +public class SlimePad extends MantleBlock { - public SlimePad(Material par2Material) - { + public SlimePad(Material par2Material) { super(par2Material); setBlockBounds(0.125F, 0.0625F, 0.125F, 0.875F, 0.625F, 0.875F); this.setCreativeTab(TConstructRegistry.blockTab); } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { - if (!world.isBlockIndirectlyGettingPowered(x, y, z)) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isBlockIndirectlyGettingPowered(x, y, z)) { double moveX = 0; double moveZ = 0; double speed = 0.25; int meta = world.getBlockMetadata(x, y, z); - switch (meta % 8) - { - case 6: - moveX += speed; - break; - case 7: - moveX += speed; - moveZ += speed; - break; - case 0: - moveZ += speed; - break; - case 1: - moveZ += speed; - moveX -= speed; - break; - case 2: - moveX -= speed; - break; - case 3: - moveX -= speed; - moveZ -= speed; - break; - case 4: - moveZ -= speed; - break; - case 5: - moveZ -= speed; - moveX += speed; - break; + switch (meta % 8) { + case 6: + moveX += speed; + break; + case 7: + moveX += speed; + moveZ += speed; + break; + case 0: + moveZ += speed; + break; + case 1: + moveZ += speed; + moveX -= speed; + break; + case 2: + moveX -= speed; + break; + case 3: + moveX -= speed; + moveZ -= speed; + break; + case 4: + moveZ -= speed; + break; + case 5: + moveZ -= speed; + moveX += speed; + break; } - if (entity instanceof EntityItem) - { + if (entity instanceof EntityItem) { entity.posY += 1; } entity.fallDistance = 0.0F; entity.addVelocity(moveX, speed * 2, moveZ); - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, this.stepSound.getStepResourcePath(), (this.stepSound.getVolume()) / 2.0F, this.stepSound.getPitch() * 0.65F); + world.playSoundEffect( + x + 0.5F, + y + 0.5F, + z + 0.5F, + this.stepSound.getStepResourcePath(), + (this.stepSound.getVolume()) / 2.0F, + this.stepSound.getPitch() * 0.65F); } } - public boolean isBlockReplaceable (World world, int x, int y, int z) - { + public boolean isBlockReplaceable(World world, int x, int y, int z) { return false; } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) - { - int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + (entity.isSneaking() ? 4 : 0) & 7; + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + + (entity.isSneaking() ? 4 : 0) + & 7; int meta = world.getBlockMetadata(x, y, z) & 8; world.setBlockMetadataWithNotify(x, y, z, face | meta, 2); } @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @Override - public int getRenderBlockPass () - { + public int getRenderBlockPass() { return 1; } @Override - public int getRenderType () - { + public int getRenderType() { return SlimePadRender.model; } @Override - public void registerBlockIcons (IIconRegister iconRegister) - { - } + public void registerBlockIcons(IIconRegister iconRegister) {} @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { + public IIcon getIcon(int side, int meta) { return TinkerWorld.slimeGel.getIcon(side, 1); } @SideOnly(Side.CLIENT) - public IIcon getFluidIcon (int meta) - { + public IIcon getFluidIcon(int meta) { return TinkerWorld.slimeChannel.getIcon(2, 0); } @SideOnly(Side.CLIENT) - public IIcon getNubIcon (int meta) - { + public IIcon getNubIcon(int meta) { return TinkerWorld.slimeGel.getIcon(0, 0); } } diff --git a/src/main/java/tconstruct/world/blocks/SoilBlock.java b/src/main/java/tconstruct/world/blocks/SoilBlock.java index 27c71df2e41..474a5f9f26b 100644 --- a/src/main/java/tconstruct/world/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/world/blocks/SoilBlock.java @@ -8,30 +8,24 @@ import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; -public class SoilBlock extends TConstructBlock -{ - static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue", "nether_grout" }; +public class SoilBlock extends TConstructBlock { + static String[] soilTypes = new String[] { + "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue", "nether_grout" + }; - public SoilBlock() - { + public SoilBlock() { super(Material.ground, 3.0F, soilTypes); this.setHarvestLevel("shovel", -1); } @Override - public void onEntityWalking (World world, int x, int y, int z, Entity entity) - { - if (entity instanceof EntityLivingBase) - { - if (((EntityLivingBase) entity).getCreatureAttribute() == EnumCreatureAttribute.UNDEAD) - { + public void onEntityWalking(World world, int x, int y, int z, Entity entity) { + if (entity instanceof EntityLivingBase) { + if (((EntityLivingBase) entity).getCreatureAttribute() == EnumCreatureAttribute.UNDEAD) { int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 3) - { + if (metadata == 3) { ((EntityLivingBase) entity).heal(1); - } - else if (metadata == 4) - { + } else if (metadata == 4) { ((EntityLivingBase) entity).attackEntityFrom(DamageSource.magic, 1); ((EntityLivingBase) entity).setFire(1); } @@ -40,15 +34,12 @@ else if (metadata == 4) } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) - { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); - if (meta < 3) - { + if (meta < 3) { entity.motionX *= 0.4; entity.motionZ *= 0.4; - if (meta != 1 && entity instanceof EntityLivingBase) - { + if (meta != 1 && entity instanceof EntityLivingBase) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.weakness.id, 1)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 1)); } @@ -56,8 +47,7 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z); } diff --git a/src/main/java/tconstruct/world/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java index 630022d63ae..935acc79aa4 100644 --- a/src/main/java/tconstruct/world/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -13,51 +13,43 @@ import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -public class SoilSlab extends SlabBase -{ - public SoilSlab() - { +public class SoilSlab extends SlabBase { + public SoilSlab() { super(Material.ground); this.setCreativeTab(TConstructRegistry.blockTab); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister iconRegister) - { + public void registerBlockIcons(IIconRegister iconRegister) { this.blockIcon = iconRegister.registerIcon("tinker:grass_top"); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) - { - switch (meta % 8) - { - case 0: - return this.blockIcon;// Block.grass.getIcon(1, 0); - case 1: - return Blocks.dirt.getIcon(side, 0); - case 2: - return Blocks.mycelium.getIcon(1, 0); - default: - return TinkerTools.craftedSoil.getIcon(side, meta - 3); + public IIcon getIcon(int side, int meta) { + switch (meta % 8) { + case 0: + return this.blockIcon; // Block.grass.getIcon(1, 0); + case 1: + return Blocks.dirt.getIcon(side, 0); + case 2: + return Blocks.mycelium.getIcon(1, 0); + default: + return TinkerTools.craftedSoil.getIcon(side, meta - 3); } } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 8; iter++) - { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { + for (int iter = 0; iter < 8; iter++) { list.add(new ItemStack(b, 1, iter)); } } @Override @SideOnly(Side.CLIENT) - public int getBlockColor () - { + public int getBlockColor() { double d0 = 0.5D; double d1 = 1.0D; return ColorizerGrass.getGrassColor(d0, d1); @@ -65,8 +57,7 @@ public int getBlockColor () @Override @SideOnly(Side.CLIENT) - public int getRenderColor (int par1) - { + public int getRenderColor(int par1) { // if (par1 % 8 == 0) return this.getBlockColor(); // return 0xFFFFFF; @@ -74,16 +65,13 @@ public int getRenderColor (int par1) @Override @SideOnly(Side.CLIENT) - public int colorMultiplier (IBlockAccess world, int x, int y, int z) - { + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { int l = 0; int i1 = 0; int j1 = 0; - for (int k1 = -1; k1 <= 1; ++k1) - { - for (int l1 = -1; l1 <= 1; ++l1) - { + for (int k1 = -1; k1 <= 1; ++k1) { + for (int l1 = -1; l1 <= 1; ++l1) { int i2 = world.getBiomeGenForCoords(x + l1, z + k1).getBiomeGrassColor(x, y, z); l += (i2 & 16711680) >> 16; i1 += (i2 & 65280) >> 8; diff --git a/src/main/java/tconstruct/world/blocks/StoneLadder.java b/src/main/java/tconstruct/world/blocks/StoneLadder.java index c0ddcb28d2a..e28e8230ee4 100644 --- a/src/main/java/tconstruct/world/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/world/blocks/StoneLadder.java @@ -7,8 +7,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; -public class StoneLadder extends BlockLadder -{ +public class StoneLadder extends BlockLadder { // Override ladder material public final Material blockMaterial = Material.rock; @@ -16,24 +15,20 @@ public class StoneLadder extends BlockLadder private IIcon icon; // Use the normally protected constructor - public StoneLadder() - { + public StoneLadder() { super(); this.setBlockName("decoration.stoneladder"); this.setCreativeTab(CreativeTabs.tabDecorations); } @Override - public void registerBlockIcons (IIconRegister register) - { + public void registerBlockIcons(IIconRegister register) { icon = register.registerIcon("tinker:ladder_stone"); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int meta, int side) - { + public IIcon getIcon(int meta, int side) { return icon; } - } diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java index 94ea961e213..8f6566411bf 100644 --- a/src/main/java/tconstruct/world/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -1,5 +1,7 @@ package tconstruct.world.blocks; +import static net.minecraftforge.common.util.ForgeDirection.*; + import cpw.mods.fml.relauncher.*; import java.util.Random; import mantle.blocks.MantleBlock; @@ -10,12 +12,8 @@ import net.minecraft.util.*; import net.minecraft.world.World; -import static net.minecraftforge.common.util.ForgeDirection.*; - -public class StoneTorch extends MantleBlock -{ - public StoneTorch() - { +public class StoneTorch extends MantleBlock { + public StoneTorch() { super(Material.circuits); this.setCreativeTab(CreativeTabs.tabDecorations); setLightLevel(0.9375F); @@ -26,8 +24,7 @@ public StoneTorch() * box can change after the pool has been cleared to be reused) */ @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4) - { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { return null; } @@ -37,8 +34,7 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, * the player can attach torches, redstone wire, etc to this block. */ @Override - public boolean isOpaqueCube () - { + public boolean isOpaqueCube() { return false; } @@ -47,8 +43,7 @@ public boolean isOpaqueCube () * (examples: signs, buttons, stairs, etc) */ @Override - public boolean renderAsNormalBlock () - { + public boolean renderAsNormalBlock() { return false; } @@ -56,22 +51,17 @@ public boolean renderAsNormalBlock () * The type of render function that is called for this block */ @Override - public int getRenderType () - { + public int getRenderType() { return 2; } /** * Gets if we can place a torch on a block. */ - private boolean canPlaceTorchOn (World par1World, int par2, int par3, int par4) - { - if (par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3, par4)) - { + private boolean canPlaceTorchOn(World par1World, int par2, int par3, int par4) { + if (par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3, par4)) { return true; - } - else - { + } else { Block b = par1World.getBlock(par2, par3, par4); return (b != null && b.canPlaceTorchOnTop(par1World, par2, par3, par4)); } @@ -82,9 +72,12 @@ private boolean canPlaceTorchOn (World par1World, int par2, int par3, int par4) * coordinates. Args: world, x, y, z */ @Override - public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) - { - return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4); + public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { + return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) + || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) + || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) + || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) + || canPlaceTorchOn(par1World, par2, par3 - 1, par4); } /** @@ -92,71 +85,53 @@ public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) * side, hitX, hitY, hitZ, block metadata */ @Override - public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) - { + public int onBlockPlaced( + World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { int j1 = par9; - if (par5 == 1 && this.canPlaceTorchOn(par1World, par2, par3 - 1, par4)) - { + if (par5 == 1 && this.canPlaceTorchOn(par1World, par2, par3 - 1, par4)) { j1 = 5; } - if (par5 == 2 && par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true)) - { + if (par5 == 2 && par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true)) { j1 = 4; } - if (par5 == 3 && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true)) - { + if (par5 == 3 && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true)) { j1 = 3; } - if (par5 == 4 && par1World.isSideSolid(par2 + 1, par3, par4, WEST, true)) - { + if (par5 == 4 && par1World.isSideSolid(par2 + 1, par3, par4, WEST, true)) { j1 = 2; } - if (par5 == 5 && par1World.isSideSolid(par2 - 1, par3, par4, EAST, true)) - { + if (par5 == 5 && par1World.isSideSolid(par2 - 1, par3, par4, EAST, true)) { j1 = 1; } return j1; } - public void updateTick (World par1World, int par2, int par3, int par4, Random random) - { + public void updateTick(World par1World, int par2, int par3, int par4, Random random) { super.updateTick(par1World, par2, par3, par4, random); - if (par1World.getBlockMetadata(par2, par3, par4) == 0) - { + if (par1World.getBlockMetadata(par2, par3, par4) == 0) { this.onBlockAdded(par1World, par2, par3, par4); } } // JAVADOC METHOD $$ func_149726_b - public void onBlockAdded (World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) - { - if (p_149726_1_.getBlockMetadata(p_149726_2_, p_149726_3_, p_149726_4_) == 0) - { - if (p_149726_1_.isSideSolid(p_149726_2_ - 1, p_149726_3_, p_149726_4_, EAST, true)) - { + public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) { + if (p_149726_1_.getBlockMetadata(p_149726_2_, p_149726_3_, p_149726_4_) == 0) { + if (p_149726_1_.isSideSolid(p_149726_2_ - 1, p_149726_3_, p_149726_4_, EAST, true)) { p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 1, 2); - } - else if (p_149726_1_.isSideSolid(p_149726_2_ + 1, p_149726_3_, p_149726_4_, WEST, true)) - { + } else if (p_149726_1_.isSideSolid(p_149726_2_ + 1, p_149726_3_, p_149726_4_, WEST, true)) { p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 2, 2); - } - else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ - 1, SOUTH, true)) - { + } else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ - 1, SOUTH, true)) { p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 3, 2); - } - else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ + 1, NORTH, true)) - { + } else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ + 1, NORTH, true)) { p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 4, 2); - } - else if (this.canPlaceTorchOn(p_149726_1_, p_149726_2_, p_149726_3_ - 1, p_149726_4_)) - { + } else if (this.canPlaceTorchOn(p_149726_1_, p_149726_2_, p_149726_3_ - 1, p_149726_4_)) { p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 5, 2); } } @@ -166,8 +141,7 @@ else if (this.canPlaceTorchOn(p_149726_1_, p_149726_2_, p_149726_3_ - 1, p_14972 @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons (IIconRegister par1IconRegister) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon("tinker:torch_stone"); } @@ -177,56 +151,43 @@ public void registerBlockIcons (IIconRegister par1IconRegister) * neighbor blockID */ @Override - public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5) - { + public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) { this.func_94397_d(par1World, par2, par3, par4, par5); } - protected boolean func_94397_d (World par1World, int par2, int par3, int par4, Block par5) - { - if (this.dropTorchIfCantStay(par1World, par2, par3, par4)) - { + protected boolean func_94397_d(World par1World, int par2, int par3, int par4, Block par5) { + if (this.dropTorchIfCantStay(par1World, par2, par3, par4)) { int i1 = par1World.getBlockMetadata(par2, par3, par4); boolean flag = false; - if (!par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) && i1 == 1) - { + if (!par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) && i1 == 1) { flag = true; } - if (!par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) && i1 == 2) - { + if (!par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) && i1 == 2) { flag = true; } - if (!par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) && i1 == 3) - { + if (!par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) && i1 == 3) { flag = true; } - if (!par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) && i1 == 4) - { + if (!par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) && i1 == 4) { flag = true; } - if (!this.canPlaceTorchOn(par1World, par2, par3 - 1, par4) && i1 == 5) - { + if (!this.canPlaceTorchOn(par1World, par2, par3 - 1, par4) && i1 == 5) { flag = true; } - if (flag) - { + if (flag) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); par1World.setBlockToAir(par2, par3, par4); return true; - } - else - { + } else { return false; } - } - else - { + } else { return true; } } @@ -236,21 +197,16 @@ protected boolean func_94397_d (World par1World, int par2, int par3, int par4, B * item if it is unable to stay. Returns True if it can stay and False if it * drops. Args: world, x, y, z */ - protected boolean dropTorchIfCantStay (World par1World, int par2, int par3, int par4) - { - if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) - { - if (par1World.getBlock(par2, par3, par4) == (Block) this) - { + protected boolean dropTorchIfCantStay(World par1World, int par2, int par3, int par4) { + if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { + if (par1World.getBlock(par2, par3, par4) == (Block) this) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); par1World.setBlockToAir(par2, par3, par4); - //WorldHelper.setBlockToAir(par1World, par2, par3, par4); + // WorldHelper.setBlockToAir(par1World, par2, par3, par4); } return false; - } - else - { + } else { return true; } } @@ -260,29 +216,20 @@ protected boolean dropTorchIfCantStay (World par1World, int par2, int par3, int * returning a ray trace hit. Args: world, x, y, z, startVec, endVec */ @Override - public MovingObjectPosition collisionRayTrace (World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) - { + public MovingObjectPosition collisionRayTrace( + World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) { int l = par1World.getBlockMetadata(par2, par3, par4) & 7; float f = 0.15F; - if (l == 1) - { + if (l == 1) { this.setBlockBounds(0.0F, 0.2F, 0.5F - f, f * 2.0F, 0.8F, 0.5F + f); - } - else if (l == 2) - { + } else if (l == 2) { this.setBlockBounds(1.0F - f * 2.0F, 0.2F, 0.5F - f, 1.0F, 0.8F, 0.5F + f); - } - else if (l == 3) - { + } else if (l == 3) { this.setBlockBounds(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F); - } - else if (l == 4) - { + } else if (l == 4) { this.setBlockBounds(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F); - } - else - { + } else { f = 0.1F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f); } @@ -295,8 +242,7 @@ else if (l == 4) /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick (World par1World, int par2, int par3, int par4, Random par5Random) - { + public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { int meta = par1World.getBlockMetadata(par2, par3, par4); double d0 = (double) ((float) par2 + 0.5F); double d1 = (double) ((float) par3 + 0.7F); @@ -304,28 +250,19 @@ public void randomDisplayTick (World par1World, int par2, int par3, int par4, Ra double d3 = 0.2199999988079071D; double d4 = 0.27000001072883606D; - if (meta == 1) - { + if (meta == 1) { par1World.spawnParticle("smoke", d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); par1World.spawnParticle("flame", d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); - } - else if (meta == 2) - { + } else if (meta == 2) { par1World.spawnParticle("smoke", d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); par1World.spawnParticle("flame", d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); - } - else if (meta == 3) - { + } else if (meta == 3) { par1World.spawnParticle("smoke", d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D); par1World.spawnParticle("flame", d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D); - } - else if (meta == 4) - { + } else if (meta == 4) { par1World.spawnParticle("smoke", d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D); par1World.spawnParticle("flame", d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D); - } - else - { + } else { par1World.spawnParticle("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D); par1World.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D); } diff --git a/src/main/java/tconstruct/world/blocks/TMetalBlock.java b/src/main/java/tconstruct/world/blocks/TMetalBlock.java index 62120c87927..0d23dd3b820 100644 --- a/src/main/java/tconstruct/world/blocks/TMetalBlock.java +++ b/src/main/java/tconstruct/world/blocks/TMetalBlock.java @@ -5,20 +5,29 @@ import net.minecraft.world.IBlockAccess; import tconstruct.blocks.TConstructBlock; -public class TMetalBlock extends TConstructBlock -{ +public class TMetalBlock extends TConstructBlock { - static String[] metalTypes = new String[] { "compressed_cobalt", "compressed_ardite", "compressed_manyullyn", "compressed_copper", "compressed_bronze", "compressed_tin", "compressed_aluminum", "compressed_alubrass", "compressed_alumite", "compressed_steel", "compressed_ender" }; + static String[] metalTypes = new String[] { + "compressed_cobalt", + "compressed_ardite", + "compressed_manyullyn", + "compressed_copper", + "compressed_bronze", + "compressed_tin", + "compressed_aluminum", + "compressed_alubrass", + "compressed_alumite", + "compressed_steel", + "compressed_ender" + }; - public TMetalBlock(Material material, float hardness) - { + public TMetalBlock(Material material, float hardness) { super(material, hardness, metalTypes); this.setStepSound(Block.soundTypeMetal); } @Override - public boolean isBeaconBase (IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) - { + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { return true; } } diff --git a/src/main/java/tconstruct/world/blocks/WoodRail.java b/src/main/java/tconstruct/world/blocks/WoodRail.java index 5ff66187b18..eb9b7e7ae46 100644 --- a/src/main/java/tconstruct/world/blocks/WoodRail.java +++ b/src/main/java/tconstruct/world/blocks/WoodRail.java @@ -8,13 +8,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class WoodRail extends BlockRailBase -{ +public class WoodRail extends BlockRailBase { @SideOnly(Side.CLIENT) private IIcon theIcon; - public WoodRail() - { + public WoodRail() { super(false); } @@ -23,8 +21,7 @@ public WoodRail() /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public IIcon getIcon (int par1, int par2) - { + public IIcon getIcon(int par1, int par2) { return par2 >= 6 ? this.theIcon : this.blockIcon; } @@ -34,24 +31,21 @@ public IIcon getIcon (int par1, int par2) * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void registerBlockIcons (IIconRegister par1IconRegister) - { + public void registerBlockIcons(IIconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon("tinker:woodrail"); this.theIcon = par1IconRegister.registerIcon("tinker:woodrail_turn"); } - protected void func_94358_a (World par1World, int par2, int par3, int par4, int par5, int par6, Block par7) - { - if (par7 != Blocks.air && par7.canProvidePower() && (new Rail(par1World, par2, par3, par4)).func_150650_a() == 3) - { + protected void func_94358_a(World par1World, int par2, int par3, int par4, int par5, int par6, Block par7) { + if (par7 != Blocks.air + && par7.canProvidePower() + && (new Rail(par1World, par2, par3, par4)).func_150650_a() == 3) { this.func_150052_a(par1World, par2, par3, par4, false); } } @Override - public float getRailMaxSpeed (World world, EntityMinecart cart, int y, int x, int z) - { + public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int z) { return 0.3f; } - } diff --git a/src/main/java/tconstruct/world/entity/BlueSlime.java b/src/main/java/tconstruct/world/entity/BlueSlime.java index 31d60881334..73afd202187 100644 --- a/src/main/java/tconstruct/world/entity/BlueSlime.java +++ b/src/main/java/tconstruct/world/entity/BlueSlime.java @@ -4,8 +4,7 @@ import net.minecraft.world.*; import tconstruct.world.TinkerWorld; -public class BlueSlime extends SlimeBase -{ +public class BlueSlime extends SlimeBase { public BlueSlime(World world) { super(world); } @@ -14,8 +13,7 @@ public BlueSlime(World world) { * Returns the item ID for the item the mob drops on death. */ @Override - protected Item getDropItem () - { + protected Item getDropItem() { return TinkerWorld.strangeFood; } diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index cb1d1a805a5..3570b0a0d21 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -17,33 +17,49 @@ import net.minecraft.util.*; import net.minecraft.world.*; -public class CartEntity extends Entity implements IInventory, IEntityAdditionalSpawnData -{ +public class CartEntity extends Entity implements IInventory, IEntityAdditionalSpawnData { /** Array of item stacks stored in minecart (for storage minecarts). */ protected ItemStack[] cargoItems; + protected int fuel; protected boolean isInReverse; /** The type of minecart, 2 for powered, 1 for storage. */ private int pullcartType; + public double pushX; public double pushZ; protected boolean field_82345_h; /** Minecart rotational logic matrix */ - protected static final int[][][] matrix = new int[][][] { { { 0, 0, -1 }, { 0, 0, 1 } }, { { -1, 0, 0 }, { 1, 0, 0 } }, { { -1, -1, 0 }, { 1, 0, 0 } }, { { -1, 0, 0 }, { 1, -1, 0 } }, { { 0, 0, -1 }, { 0, -1, 1 } }, { { 0, -1, -1 }, { 0, 0, 1 } }, { { 0, 0, 1 }, { 1, 0, 0 } }, { { 0, 0, 1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { 1, 0, 0 } } }; + protected static final int[][][] matrix = new int[][][] { + {{0, 0, -1}, {0, 0, 1}}, + {{-1, 0, 0}, {1, 0, 0}}, + {{-1, -1, 0}, {1, 0, 0}}, + {{-1, 0, 0}, {1, -1, 0}}, + {{0, 0, -1}, {0, -1, 1}}, + {{0, -1, -1}, {0, 0, 1}}, + {{0, 0, 1}, {1, 0, 0}}, + {{0, 0, 1}, {-1, 0, 0}}, + {{0, 0, -1}, {-1, 0, 0}}, + {{0, 0, -1}, {1, 0, 0}} + }; /** appears to be the progress of the turn */ protected int turnProgress; + protected double minecartX; protected double minecartY; protected double minecartZ; protected double minecartYaw; protected double minecartPitch; + @SideOnly(Side.CLIENT) protected double velocityX; + @SideOnly(Side.CLIENT) protected double velocityY; + @SideOnly(Side.CLIENT) protected double velocityZ; @@ -67,8 +83,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS Entity entityFollowing; - public CartEntity(World par1World) - { + public CartEntity(World par1World) { super(par1World); this.cargoItems = new ItemStack[36]; this.fuel = 0; @@ -86,14 +101,12 @@ public CartEntity(World par1World) dragAir = defaultDragAir; } - public CartEntity(World world, int type) - { + public CartEntity(World world, int type) { this(world); pullcartType = type; } - public CartEntity(World world, double x, double y, double z, int type) - { + public CartEntity(World world, double x, double y, double z, int type) { this(world); this.setPosition(x, y + (double) this.yOffset, z); this.motionX = 0.0D; @@ -111,14 +124,12 @@ public CartEntity(World world, double x, double y, double z, int type) * walk on. used for spiders and wolves to prevent them from trampling crops */ @Override - protected boolean canTriggerWalking () - { + protected boolean canTriggerWalking() { return false; } @Override - protected void entityInit () - { + protected void entityInit() { this.dataWatcher.addObject(16, new Byte((byte) 0)); this.dataWatcher.addObject(17, new Integer(0)); this.dataWatcher.addObject(18, new Integer(1)); @@ -131,8 +142,7 @@ protected void entityInit () * minecarts. */ @Override - public AxisAlignedBB getCollisionBox (Entity par1Entity) - { + public AxisAlignedBB getCollisionBox(Entity par1Entity) { return par1Entity.boundingBox; } @@ -140,8 +150,7 @@ public AxisAlignedBB getCollisionBox (Entity par1Entity) * returns the bounding box for this entity */ @Override - public AxisAlignedBB getBoundingBox () - { + public AxisAlignedBB getBoundingBox() { return this.boundingBox; } @@ -150,8 +159,7 @@ public AxisAlignedBB getBoundingBox () * when colliding. */ @Override - public boolean canBePushed () - { + public boolean canBePushed() { return canBePushed; } @@ -160,38 +168,30 @@ public boolean canBePushed () * this one. */ @Override - public double getMountedYOffset () - { + public double getMountedYOffset() { return (double) this.height * 0.0D - 0.30000001192092896D; } /** * Called when the entity is attacked. */ - public boolean attackEntityFrom (DamageSource par1DamageSource, int par2) - { - if (!this.worldObj.isRemote && !this.isDead) - { - if (this.isEntityInvulnerable()) - { + public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) { + if (!this.worldObj.isRemote && !this.isDead) { + if (this.isEntityInvulnerable()) { return false; - } - else - { + } else { this.setRollingDirection(-this.getRollingDirection()); this.setRollingAmplitude(10); this.setBeenAttacked(); this.setDamage(this.getDamage() + par2 * 10); - if (par1DamageSource.getEntity() instanceof EntityPlayer && ((EntityPlayer) par1DamageSource.getEntity()).capabilities.isCreativeMode) - { + if (par1DamageSource.getEntity() instanceof EntityPlayer + && ((EntityPlayer) par1DamageSource.getEntity()).capabilities.isCreativeMode) { this.setDamage(100); } - if (this.getDamage() > 40) - { - if (this.riddenByEntity != null) - { + if (this.getDamage() > 40) { + if (this.riddenByEntity != null) { this.riddenByEntity.mountEntity(this); } @@ -201,9 +201,7 @@ public boolean attackEntityFrom (DamageSource par1DamageSource, int par2) return true; } - } - else - { + } else { return true; } } @@ -213,8 +211,7 @@ public boolean attackEntityFrom (DamageSource par1DamageSource, int par2) /** * Setups the entity to do the hurt animation. Only used by packets in multiplayer. */ - public void performHurtAnimation () - { + public void performHurtAnimation() { this.setRollingDirection(-this.getRollingDirection()); this.setRollingAmplitude(10); this.setDamage(this.getDamage() + this.getDamage() * 10); @@ -225,8 +222,7 @@ public void performHurtAnimation () * this Entity. */ @Override - public boolean canBeCollidedWith () - { + public boolean canBeCollidedWith() { return !this.isDead; } @@ -234,35 +230,34 @@ public boolean canBeCollidedWith () * Will get destroyed next tick. */ @Override - public void setDead () - { - if (this.field_82345_h) - { - for (int var1 = 0; var1 < this.getSizeInventory(); ++var1) - { + public void setDead() { + if (this.field_82345_h) { + for (int var1 = 0; var1 < this.getSizeInventory(); ++var1) { ItemStack var2 = this.getStackInSlot(var1); - if (var2 != null) - { + if (var2 != null) { float var3 = this.rand.nextFloat() * 0.8F + 0.1F; float var4 = this.rand.nextFloat() * 0.8F + 0.1F; float var5 = this.rand.nextFloat() * 0.8F + 0.1F; - while (var2.stackSize > 0) - { + while (var2.stackSize > 0) { int var6 = this.rand.nextInt(21) + 10; - if (var6 > var2.stackSize) - { + if (var6 > var2.stackSize) { var6 = var2.stackSize; } var2.stackSize -= var6; - EntityItem entityitem = new EntityItem(this.worldObj, this.posX + (double) var3, this.posY + (double) var4, this.posZ + (double) var5, new ItemStack(var2.getItem(), var6, var2.getItemDamage())); - - if (var2.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) var2.getTagCompound().copy()); + EntityItem entityitem = new EntityItem( + this.worldObj, + this.posX + (double) var3, + this.posY + (double) var4, + this.posZ + (double) var5, + new ItemStack(var2.getItem(), var6, var2.getItemDamage())); + + if (var2.hasTagCompound()) { + entityitem.getEntityItem().setTagCompound((NBTTagCompound) + var2.getTagCompound().copy()); } float var8 = 0.05F; @@ -283,8 +278,7 @@ public void setDead () * teleport to */ @Override - public void travelToDimension (int par1) - { + public void travelToDimension(int par1) { this.field_82345_h = false; super.travelToDimension(par1); } @@ -293,93 +287,80 @@ public void travelToDimension (int par1) * Called to update the entity's position/logic. */ @Override - public void onUpdate () - { - if (this.getRollingAmplitude() > 0) - { + public void onUpdate() { + if (this.getRollingAmplitude() > 0) { this.setRollingAmplitude(this.getRollingAmplitude() - 1); } - if (this.getDamage() > 0) - { + if (this.getDamage() > 0) { this.setDamage(this.getDamage() - 1); } - if (this.posY < -64.0D) - { + if (this.posY < -64.0D) { this.kill(); } - if (this.isMinecartPowered() && this.rand.nextInt(4) == 0 && pullcartType == 2 && getClass() == CartEntity.class) - { + if (this.isMinecartPowered() + && this.rand.nextInt(4) == 0 + && pullcartType == 2 + && getClass() == CartEntity.class) { this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D); } int var2; - if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) - { + if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer) { this.worldObj.theProfiler.startSection("portal"); MinecraftServer var1 = ((WorldServer) this.worldObj).func_73046_m(); var2 = this.getMaxInPortalTime(); - if (this.inPortal) - { - if (var1.getAllowNether()) - { + if (this.inPortal) { + if (var1.getAllowNether()) { /* * if (this.ridingEntity == null && this.timeInPortal++ >= * var2) { this.timeInPortal = var2; this.timeUntilPortal = * this.getPortalCooldown(); byte var3; - * + * * if (this.worldObj.provider.dimensionId == -1) { var3 = 0; * } else { var3 = -1; } - * + * * this.travelToDimension(var3); } - * + * * this.inPortal = false; */ } - } - else - { + } else { /* * if (this.timeInPortal > 0) { this.timeInPortal -= 4; } - * + * * if (this.timeInPortal < 0) { this.timeInPortal = 0; } */ } - if (this.timeUntilPortal > 0) - { + if (this.timeUntilPortal > 0) { --this.timeUntilPortal; } this.worldObj.theProfiler.endSection(); } - if (this.worldObj.isRemote) - { - if (this.turnProgress > 0) - { + if (this.worldObj.isRemote) { + if (this.turnProgress > 0) { double var46 = this.posX + (this.minecartX - this.posX) / (double) this.turnProgress; double var48 = this.posY + (this.minecartY - this.posY) / (double) this.turnProgress; double var5 = this.posZ + (this.minecartZ - this.posZ) / (double) this.turnProgress; double var7 = MathHelper.wrapAngleTo180_double(this.minecartYaw - (double) this.rotationYaw); this.rotationYaw = (float) ((double) this.rotationYaw + var7 / (double) this.turnProgress); - this.rotationPitch = (float) ((double) this.rotationPitch + (this.minecartPitch - (double) this.rotationPitch) / (double) this.turnProgress); + this.rotationPitch = (float) ((double) this.rotationPitch + + (this.minecartPitch - (double) this.rotationPitch) / (double) this.turnProgress); --this.turnProgress; this.setPosition(var46, var48, var5); this.setRotation(this.rotationYaw, this.rotationPitch); - } - else - { + } else { this.setPosition(this.posX, this.posY, this.posZ); this.setRotation(this.rotationYaw, this.rotationPitch); } - } - else - { + } else { this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; @@ -388,8 +369,7 @@ public void onUpdate () var2 = MathHelper.floor_double(this.posY); int var47 = MathHelper.floor_double(this.posZ); - if (BlockRail.func_150049_b_(this.worldObj, var45, var2 - 1, var47)) - { + if (BlockRail.func_150049_b_(this.worldObj, var45, var2 - 1, var47)) { --var2; } @@ -398,28 +378,24 @@ public void onUpdate () Block var8 = this.worldObj.getBlock(var45, var2, var47); moveMinecartOffRail(var45, var2, var47); - if (entityFollowing != null) - moveTowardsEntity(entityFollowing); + if (entityFollowing != null) moveTowardsEntity(entityFollowing); this.func_145775_I(); this.rotationPitch = 0.0F; double var49 = this.prevPosX - this.posX; double var50 = this.prevPosZ - this.posZ; - if (var49 * var49 + var50 * var50 > 0.001D) - { + if (var49 * var49 + var50 * var50 > 0.001D) { this.rotationYaw = (float) (Math.atan2(var50, var49) * 180.0D / Math.PI); - if (this.isInReverse) - { + if (this.isInReverse) { this.rotationYaw += 180.0F; } } double var51 = (double) MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); - if (var51 < -170.0D || var51 >= 170.0D) - { + if (var51 < -170.0D || var51 >= 170.0D) { this.rotationYaw += 180.0F; this.isInReverse = !this.isInReverse; } @@ -430,23 +406,18 @@ public void onUpdate () List var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, box); - if (var15 != null && !var15.isEmpty()) - { - for (int var52 = 0; var52 < var15.size(); ++var52) - { + if (var15 != null && !var15.isEmpty()) { + for (int var52 = 0; var52 < var15.size(); ++var52) { Entity var17 = (Entity) var15.get(var52); - if (var17 != this.riddenByEntity && var17.canBePushed() && var17 instanceof CartEntity) - { + if (var17 != this.riddenByEntity && var17.canBePushed() && var17 instanceof CartEntity) { var17.applyEntityCollision(this); } } } - if (this.riddenByEntity != null && this.riddenByEntity.isDead) - { - if (this.riddenByEntity.ridingEntity == this) - { + if (this.riddenByEntity != null && this.riddenByEntity.isDead) { + if (this.riddenByEntity.ridingEntity == this) { this.riddenByEntity.ridingEntity = null; } @@ -457,13 +428,12 @@ public void onUpdate () } } - void moveTowardsEntity (Entity entity) - { + void moveTowardsEntity(Entity entity) { // TConstruct.logger.info("Moving towards entity"); /* * double distX = this.posX - entity.posX; double distZ = this.posZ - * entity.posZ; //posY = posY + 0.1; - * + * * if (entity.posY > this.posY) motionY += 0.1; if (distX > 0.5 && distZ * > 0.5) { motionX = -distX; motionZ = -distZ; } */ @@ -471,8 +441,8 @@ void moveTowardsEntity (Entity entity) double var15 = entity.posX; double var19 = entity.posZ; - if (this.calculateDistance(this.prevPosX, var15) > 1.5D || this.calculateDistance(this.prevPosZ, var19) > 1.5D) - { + if (this.calculateDistance(this.prevPosX, var15) > 1.5D + || this.calculateDistance(this.prevPosZ, var19) > 1.5D) { double var28 = this.prevPosX; double var30 = this.prevPosZ; double var36 = this.calculateDistance(var28, var15); @@ -482,37 +452,28 @@ void moveTowardsEntity (Entity entity) double var46; double var44; - if (var36 > var38) - { + if (var36 > var38) { var46 = 1.0D; var44 = var38 / var36; var42 = var44 / 3.0D; var40 = var46 / 3.0D; - } - else if (var38 > var36) - { + } else if (var38 > var36) { var44 = 1.0D; var46 = var36 / var38; var40 = var46 / 3.0D; var42 = var44 / 3.0D; } - if (var15 > var28) - { - this.motionX = var40;// * var26; - } - else - { - this.motionX = -var40;// * var26; + if (var15 > var28) { + this.motionX = var40; // * var26; + } else { + this.motionX = -var40; // * var26; } - if (var19 > var30) - { - this.motionZ = var42;// * var26; - } - else - { - this.motionZ = -var42;// * var26; + if (var19 > var30) { + this.motionZ = var42; // * var26; + } else { + this.motionZ = -var42; // * var26; } } @@ -521,12 +482,11 @@ else if (var38 > var36) */ } - public double calculateDistance (double pos1, double pos2) - { + public double calculateDistance(double pos1, double pos2) { double distance = Math.abs(pos1 - pos2); // 0.0D; /* * double absPos1 = Math.abs(pos1); double absPos2 = Math.abs(pos2); - * + * * if ((pos1 <= 0.0D || pos2 <= 0.0D) && (pos1 >= 0.0D || pos2 >= 0.0D)) * { distance = absPos1 + absPos2; } else if (absPos1 > absPos2) { * distance = absPos1 - absPos2; } else if (absPos2 > absPos1) { @@ -537,14 +497,12 @@ public double calculateDistance (double pos1, double pos2) } @SideOnly(Side.CLIENT) - public Vec3 func_70495_a (double par1, double par3, double par5, double par7) - { + public Vec3 func_70495_a(double par1, double par3, double par5, double par7) { int var9 = MathHelper.floor_double(par1); int var10 = MathHelper.floor_double(par3); int var11 = MathHelper.floor_double(par5); - if (BlockRail.func_150049_b_(this.worldObj, var9, var10 - 1, var11)) - { + if (BlockRail.func_150049_b_(this.worldObj, var9, var10 - 1, var11)) { --var10; } @@ -553,26 +511,22 @@ public Vec3 func_70495_a (double par1, double par3, double par5, double par7) return null; } - public Vec3 func_70489_a (double par1, double par3, double par5) - { + public Vec3 func_70489_a(double par1, double par3, double par5) { int var7 = MathHelper.floor_double(par1); int var8 = MathHelper.floor_double(par3); int var9 = MathHelper.floor_double(par5); - if (BlockRail.func_150049_b_(this.worldObj, var7, var8 - 1, var9)) - { + if (BlockRail.func_150049_b_(this.worldObj, var7, var8 - 1, var9)) { --var8; } Block var10 = this.worldObj.getBlock(var7, var8, var9); - if (BlockRail.func_150051_a(var10)) - { + if (BlockRail.func_150051_a(var10)) { int var11 = 0; par3 = (double) var8; - if (var11 >= 2 && var11 <= 5) - { + if (var11 >= 2 && var11 <= 5) { par3 = (double) (var8 + 1); } @@ -588,18 +542,13 @@ public Vec3 func_70489_a (double par1, double par3, double par5) double var29 = (var23 - var17) * 2.0D; double var31 = var25 - var19; - if (var27 == 0.0D) - { + if (var27 == 0.0D) { par1 = (double) var7 + 0.5D; var13 = par5 - (double) var9; - } - else if (var31 == 0.0D) - { + } else if (var31 == 0.0D) { par5 = (double) var9 + 0.5D; var13 = par1 - (double) var7; - } - else - { + } else { double var33 = par1 - var15; double var35 = par5 - var19; var13 = (var33 * var27 + var35 * var31) * 2.0D; @@ -609,20 +558,16 @@ else if (var31 == 0.0D) par3 = var17 + var29 * var13; par5 = var19 + var31 * var13; - if (var29 < 0.0D) - { + if (var29 < 0.0D) { ++par3; } - if (var29 > 0.0D) - { + if (var29 > 0.0D) { par3 += 0.5D; } return Vec3.createVectorHelper(par1, par3, par5); - } - else - { + } else { return null; } } @@ -631,25 +576,20 @@ else if (var31 == 0.0D) * (abstract) Protected helper method to write subclass entity data to NBT. */ @Override - protected void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) - { + protected void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { par1NBTTagCompound.setInteger("Type", pullcartType); - if (isPoweredCart()) - { + if (isPoweredCart()) { par1NBTTagCompound.setDouble("PushX", this.pushX); par1NBTTagCompound.setDouble("PushZ", this.pushZ); par1NBTTagCompound.setInteger("Fuel", this.fuel); } - if (getSizeInventory() > 0) - { + if (getSizeInventory() > 0) { NBTTagList var2 = new NBTTagList(); - for (int var3 = 0; var3 < this.cargoItems.length; ++var3) - { - if (this.cargoItems[var3] != null) - { + for (int var3 = 0; var3 < this.cargoItems.length; ++var3) { + if (this.cargoItems[var3] != null) { NBTTagCompound var4 = new NBTTagCompound(); var4.setByte("Slot", (byte) var3); this.cargoItems[var3].writeToNBT(var4); @@ -665,36 +605,28 @@ protected void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override - protected void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) - { + protected void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { pullcartType = par1NBTTagCompound.getInteger("Type"); - if (isPoweredCart()) - { + if (isPoweredCart()) { this.pushX = par1NBTTagCompound.getDouble("PushX"); this.pushZ = par1NBTTagCompound.getDouble("PushZ"); - try - { + try { this.fuel = par1NBTTagCompound.getInteger("Fuel"); - } - catch (ClassCastException e) - { + } catch (ClassCastException e) { this.fuel = par1NBTTagCompound.getShort("Fuel"); } } - if (getSizeInventory() > 0) - { + if (getSizeInventory() > 0) { NBTTagList var2 = par1NBTTagCompound.getTagList("Items", 10); this.cargoItems = new ItemStack[this.getSizeInventory()]; - for (int var3 = 0; var3 < var2.tagCount(); ++var3) - { + for (int var3 = 0; var3 < var2.tagCount(); ++var3) { NBTTagCompound var4 = (NBTTagCompound) var2.getCompoundTagAt(var3); int var5 = var4.getByte("Slot") & 255; - if (var5 >= 0 && var5 < this.cargoItems.length) - { + if (var5 >= 0 && var5 < this.cargoItems.length) { this.cargoItems[var5] = ItemStack.loadItemStackFromNBT(var4); } } @@ -703,8 +635,7 @@ protected void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) @Override @SideOnly(Side.CLIENT) - public float getShadowSize () - { + public float getShadowSize() { return 0.5F; } @@ -713,14 +644,16 @@ public float getShadowSize () * other. Args: entity */ @Override - public void applyEntityCollision (Entity par1Entity) - { - if (!this.worldObj.isRemote) - { - if (par1Entity != this.riddenByEntity) - { - if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) - { + public void applyEntityCollision(Entity par1Entity) { + if (!this.worldObj.isRemote) { + if (par1Entity != this.riddenByEntity) { + if (par1Entity instanceof EntityLiving + && !(par1Entity instanceof EntityPlayer) + && !(par1Entity instanceof EntityIronGolem) + && canBeRidden() + && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D + && this.riddenByEntity == null + && par1Entity.ridingEntity == null) { par1Entity.mountEntity(this); } @@ -728,15 +661,13 @@ public void applyEntityCollision (Entity par1Entity) double var4 = par1Entity.posZ - this.posZ; double var6 = var2 * var2 + var4 * var4; - if (var6 >= 9.999999747378752E-5D) - { + if (var6 >= 9.999999747378752E-5D) { var6 = (double) MathHelper.sqrt_double(var6); var2 /= var6; var4 /= var6; double var8 = 1.0D / var6; - if (var8 > 1.0D) - { + if (var8 > 1.0D) { var8 = 1.0D; } @@ -749,40 +680,37 @@ public void applyEntityCollision (Entity par1Entity) var2 *= 0.5D; var4 *= 0.5D; - if (par1Entity instanceof CartEntity) - { + if (par1Entity instanceof CartEntity) { double var10 = par1Entity.posX - this.posX; double var12 = par1Entity.posZ - this.posZ; Vec3 var14 = Vec3.createVectorHelper(var10, 0.0D, var12).normalize(); - Vec3 var15 = Vec3.createVectorHelper((double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), 0.0D, (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)).normalize(); + Vec3 var15 = Vec3.createVectorHelper( + (double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), + 0.0D, + (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) + .normalize(); double var16 = Math.abs(var14.dotProduct(var15)); - if (var16 < 0.8D) - { + if (var16 < 0.8D) { return; } double var18 = par1Entity.motionX + this.motionX; double var20 = par1Entity.motionZ + this.motionZ; - if (((CartEntity) par1Entity).isPoweredCart() && !isPoweredCart()) - { + if (((CartEntity) par1Entity).isPoweredCart() && !isPoweredCart()) { this.motionX *= 0.20000000298023224D; this.motionZ *= 0.20000000298023224D; this.addVelocity(par1Entity.motionX - var2, 0.0D, par1Entity.motionZ - var4); par1Entity.motionX *= 0.949999988079071D; par1Entity.motionZ *= 0.949999988079071D; - } - else if (!((CartEntity) par1Entity).isPoweredCart() && isPoweredCart()) - { + } else if (!((CartEntity) par1Entity).isPoweredCart() && isPoweredCart()) { par1Entity.motionX *= 0.20000000298023224D; par1Entity.motionZ *= 0.20000000298023224D; par1Entity.addVelocity(this.motionX + var2, 0.0D, this.motionZ + var4); this.motionX *= 0.949999988079071D; this.motionZ *= 0.949999988079071D; - } - else - { + } else { var18 /= 2.0D; var20 /= 2.0D; this.motionX *= 0.20000000298023224D; @@ -792,9 +720,7 @@ else if (!((CartEntity) par1Entity).isPoweredCart() && isPoweredCart()) par1Entity.motionZ *= 0.20000000298023224D; par1Entity.addVelocity(var18 + var2, 0.0D, var20 + var4); } - } - else - { + } else { this.addVelocity(-var2, 0.0D, -var4); par1Entity.addVelocity(var2 / 4.0D, 0.0D, var4 / 4.0D); } @@ -807,8 +733,7 @@ else if (!((CartEntity) par1Entity).isPoweredCart() && isPoweredCart()) * Returns the number of slots in the inventory. */ @Override - public int getSizeInventory () - { + public int getSizeInventory() { return (pullcartType == 1 && getClass() == CartEntity.class ? 27 : 0); } @@ -816,8 +741,7 @@ public int getSizeInventory () * Returns the stack in slot i */ @Override - public ItemStack getStackInSlot (int par1) - { + public ItemStack getStackInSlot(int par1) { return this.cargoItems[par1]; } @@ -826,32 +750,24 @@ public ItemStack getStackInSlot (int par1) * (second arg) of items and returns them in a new stack. */ @Override - public ItemStack decrStackSize (int par1, int par2) - { - if (this.cargoItems[par1] != null) - { + public ItemStack decrStackSize(int par1, int par2) { + if (this.cargoItems[par1] != null) { ItemStack var3; - if (this.cargoItems[par1].stackSize <= par2) - { + if (this.cargoItems[par1].stackSize <= par2) { var3 = this.cargoItems[par1]; this.cargoItems[par1] = null; return var3; - } - else - { + } else { var3 = this.cargoItems[par1].splitStack(par2); - if (this.cargoItems[par1].stackSize == 0) - { + if (this.cargoItems[par1].stackSize == 0) { this.cargoItems[par1] = null; } return var3; } - } - else - { + } else { return null; } } @@ -862,16 +778,12 @@ public ItemStack decrStackSize (int par1, int par2) * GUI. */ @Override - public ItemStack getStackInSlotOnClosing (int par1) - { - if (this.cargoItems[par1] != null) - { + public ItemStack getStackInSlotOnClosing(int par1) { + if (this.cargoItems[par1] != null) { ItemStack var2 = this.cargoItems[par1]; this.cargoItems[par1] = null; return var2; - } - else - { + } else { return null; } } @@ -881,12 +793,10 @@ public ItemStack getStackInSlotOnClosing (int par1) * crafting or armor sections). */ @Override - public void setInventorySlotContents (int par1, ItemStack par2ItemStack) - { + public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { this.cargoItems[par1] = par2ItemStack; - if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit()) - { + if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit()) { par2ItemStack.stackSize = this.getInventoryStackLimit(); } } @@ -894,8 +804,7 @@ public void setInventorySlotContents (int par1, ItemStack par2ItemStack) /** * Returns the name of the inventory. */ - public String getInvName () - { + public String getInvName() { return "container.minecart"; } @@ -904,8 +813,7 @@ public String getInvName () * 64, possibly will be extended. *Isn't this more of a set than a get?* */ @Override - public int getInventoryStackLimit () - { + public int getInventoryStackLimit() { return 64; } @@ -913,59 +821,44 @@ public int getInventoryStackLimit () * Called when an the contents of an Inventory change, usually */ @Override - public void markDirty () - { - } + public void markDirty() {} /** * Called when a player interacts with a mob. e.g. gets milk from a cow, * gets into the saddle on a pig. */ - public boolean interact (EntityPlayer player) - { - if (player.isSneaking()) - { - if (entityFollowing == null) - { + public boolean interact(EntityPlayer player) { + if (player.isSneaking()) { + if (entityFollowing == null) { entityFollowing = player; // if (!worldObj.isRemote) // player.addChatMessage("The cart is following you"); - } - else - { + } else { entityFollowing = null; // if (!worldObj.isRemote) // player.addChatMessage("The cart has stopped following you"); } return true; } - if (canBeRidden()) - { - if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != player) - { + if (canBeRidden()) { + if (this.riddenByEntity != null + && this.riddenByEntity instanceof EntityPlayer + && this.riddenByEntity != player) { return true; } - if (!this.worldObj.isRemote) - { + if (!this.worldObj.isRemote) { player.mountEntity(this); } - } - else if (getSizeInventory() > 0) - { - if (!this.worldObj.isRemote) - { + } else if (getSizeInventory() > 0) { + if (!this.worldObj.isRemote) { player.displayGUIChest(this); } - } - else if (this.pullcartType == 2 && getClass() == CartEntity.class) - { + } else if (this.pullcartType == 2 && getClass() == CartEntity.class) { ItemStack var2 = player.inventory.getCurrentItem(); - if (var2 != null && var2.getItem() == Items.coal) - { - if (--var2.stackSize == 0) - { + if (var2 != null && var2.getItem() == Items.coal) { + if (--var2.stackSize == 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack) null); } @@ -985,8 +878,7 @@ else if (this.pullcartType == 2 && getClass() == CartEntity.class) * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX, * posY, posZ, yaw, pitch */ - public void setPositionAndRotation2 (double par1, double par3, double par5, float par7, float par8, int par9) - { + public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) { this.minecartX = par1; this.minecartY = par3; this.minecartZ = par5; @@ -1003,8 +895,7 @@ public void setPositionAndRotation2 (double par1, double par3, double par5, floa /** * Sets the velocity to the args. Args: x, y, z */ - public void setVelocity (double par1, double par3, double par5) - { + public void setVelocity(double par1, double par3, double par5) { this.velocityX = this.motionX = par1; this.velocityY = this.motionY = par3; this.velocityZ = this.motionZ = par5; @@ -1015,48 +906,37 @@ public void setVelocity (double par1, double par3, double par5) * with Container */ @Override - public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) - { + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { return this.isDead ? false : par1EntityPlayer.getDistanceSqToEntity(this) <= 64.0D; } /** * Is this minecart powered (Fuel > 0) */ - public boolean isMinecartPowered () - { + public boolean isMinecartPowered() { return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0; } /** * Set if this minecart is powered (Fuel > 0) */ - protected void setMinecartPowered (boolean par1) - { - if (par1) - { + protected void setMinecartPowered(boolean par1) { + if (par1) { this.dataWatcher.updateObject(16, Byte.valueOf((byte) (this.dataWatcher.getWatchableObjectByte(16) | 1))); - } - else - { + } else { this.dataWatcher.updateObject(16, Byte.valueOf((byte) (this.dataWatcher.getWatchableObjectByte(16) & -2))); } } - public void openChest () - { - } + public void openChest() {} - public void closeChest () - { - } + public void closeChest() {} /** * Sets the current amount of damage the minecart has taken. Decreases over * time. The cart breaks when this is over 40. */ - public void setDamage (int par1) - { + public void setDamage(int par1) { this.dataWatcher.updateObject(19, Integer.valueOf(par1)); } @@ -1064,28 +944,23 @@ public void setDamage (int par1) * Gets the current amount of damage the minecart has taken. Decreases over * time. The cart breaks when this is over 40. */ - public int getDamage () - { + public int getDamage() { return this.dataWatcher.getWatchableObjectInt(19); } - public void setRollingAmplitude (int par1) - { + public void setRollingAmplitude(int par1) { this.dataWatcher.updateObject(17, Integer.valueOf(par1)); } - public int getRollingAmplitude () - { + public int getRollingAmplitude() { return this.dataWatcher.getWatchableObjectInt(17); } - public void setRollingDirection (int par1) - { + public void setRollingDirection(int par1) { this.dataWatcher.updateObject(18, Integer.valueOf(par1)); } - public int getRollingDirection () - { + public int getRollingDirection() { return this.dataWatcher.getWatchableObjectInt(18); } @@ -1093,10 +968,8 @@ public int getRollingDirection () * Drops the cart as a item. The exact item dropped is defined by * getItemDropped(). */ - public void dropCartAsItem () - { - for (ItemStack item : getItemsDropped()) - { + public void dropCartAsItem() { + for (ItemStack item : getItemsDropped()) { entityDropItem(item, 0); } } @@ -1105,15 +978,14 @@ public void dropCartAsItem () * Override this to define which items your cart drops when broken. This * does not include items contained in the inventory, that is handled * elsewhere. - * + * * @return A list of items dropped. */ - public List getItemsDropped () - { + public List getItemsDropped() { /* * List items = new ArrayList(); items.add(new * ItemStack(Item.minecartEmpty)); - * + * * switch(cartType) { case 1: items.add(new ItemStack(Block.chest)); * break; case 2: items.add(new ItemStack(Block.stoneOvenIdle)); break; * } return items; @@ -1126,22 +998,20 @@ public List getItemsDropped () * be an ItemStack that can be used by the player to place the cart. This is * the item that was registered with the cart via the registerMinecart * function, but is not necessary the item the cart drops when destroyed. - * + * * @return An ItemStack that can be used to place the cart. */ - public ItemStack getCartItem () - { + public ItemStack getCartItem() { return null; // return MinecartRegistry.getItemForCart(this); } /** * Returns true if this cart is self propelled. - * + * * @return True if powered. */ - public boolean isPoweredCart () - { + public boolean isPoweredCart() { return pullcartType == 2 && getClass() == CartEntity.class; } @@ -1149,23 +1019,20 @@ public boolean isPoweredCart () * Returns true if this cart is a storage cart Some carts may have * inventories but not be storage carts and some carts without inventories * may be storage carts. - * + * * @return True if this cart should be classified as a storage cart. */ - public boolean isStorageCart () - { + public boolean isStorageCart() { return pullcartType == 1 && getClass() == CartEntity.class; } /** * Returns true if this cart can be ridden by an Entity. - * + * * @return True if this cart can be ridden. */ - public boolean canBeRidden () - { - if (pullcartType == 0 && getClass() == CartEntity.class) - { + public boolean canBeRidden() { + if (pullcartType == 0 && getClass() == CartEntity.class) { return true; } return false; @@ -1174,67 +1041,59 @@ public boolean canBeRidden () /** * Returns true if this cart can currently use rails. This function is * mainly used to gracefully detach a minecart from a rail. - * + * * @return True if the minecart can use rails. */ - public boolean canUseRail () - { + public boolean canUseRail() { return false; } /** * Set whether the minecart can use rails. This function is mainly used to * gracefully detach a minecart from a rail. - * + * * @param use * Whether the minecart can currently use rails. */ - public void setCanUseRail (boolean use) - { + public void setCanUseRail(boolean use) { canUseRail = use; } /** * Return false if this cart should not call IRail.onMinecartPass() and * should ignore Powered Rails. - * + * * @return True if this cart should call IRail.onMinecartPass(). */ - public boolean shouldDoRailFunctions () - { + public boolean shouldDoRailFunctions() { return true; } /** * Simply returns the minecartType variable. - * + * * @return minecartType */ - public int getCartType () - { + public int getCartType() { return pullcartType; } /** * Carts should return their drag factor here - * + * * @return The drag rate. */ - protected double getDrag () - { + protected double getDrag() { return riddenByEntity != null ? defaultDragRidden : defaultDragEmpty; } /** * Moved to allow overrides. This code applies drag and updates push forces. */ - protected void applyDragAndPushForces () - { - if (isPoweredCart()) - { + protected void applyDragAndPushForces() { + if (isPoweredCart()) { double d27 = MathHelper.sqrt_double(pushX * pushX + pushZ * pushZ); - if (d27 > 0.01D) - { + if (d27 > 0.01D) { pushX /= d27; pushZ /= d27; double d29 = 0.04; @@ -1243,9 +1102,7 @@ protected void applyDragAndPushForces () motionZ *= 0.8D; motionX += pushX * d29; motionZ += pushZ * d29; - } - else - { + } else { motionX *= 0.9D; motionY *= 0.0D; motionZ *= 0.9D; @@ -1259,22 +1116,16 @@ protected void applyDragAndPushForces () /** * Moved to allow overrides. This code updates push forces. */ - protected void updatePushForces () - { - if (isPoweredCart()) - { + protected void updatePushForces() { + if (isPoweredCart()) { double push = MathHelper.sqrt_double(pushX * pushX + pushZ * pushZ); - if (push > 0.01D && motionX * motionX + motionZ * motionZ > 0.001D) - { + if (push > 0.01D && motionX * motionX + motionZ * motionZ > 0.001D) { pushX /= push; pushZ /= push; - if (pushX * motionX + pushZ * motionZ < 0.0D) - { + if (pushX * motionX + pushZ * motionZ < 0.0D) { pushX = 0.0D; pushZ = 0.0D; - } - else - { + } else { pushX = motionX; pushZ = motionZ; } @@ -1286,40 +1137,30 @@ protected void updatePushForces () * Moved to allow overrides. This code handles minecart movement and speed * capping when not on a rail. */ - protected void moveMinecartOffRail (int i, int j, int k) - { + protected void moveMinecartOffRail(int i, int j, int k) { double d2 = getMaxSpeedGround(); - if (!onGround) - { + if (!onGround) { d2 = getMaxSpeedAirLateral(); } - if (motionX < -d2) - motionX = -d2; - if (motionX > d2) - motionX = d2; - if (motionZ < -d2) - motionZ = -d2; - if (motionZ > d2) - motionZ = d2; + if (motionX < -d2) motionX = -d2; + if (motionX > d2) motionX = d2; + if (motionZ < -d2) motionZ = -d2; + if (motionZ > d2) motionZ = d2; double moveY = motionY; - if (getMaxSpeedAirVertical() > 0 && motionY > getMaxSpeedAirVertical()) - { + if (getMaxSpeedAirVertical() > 0 && motionY > getMaxSpeedAirVertical()) { moveY = getMaxSpeedAirVertical(); - if (Math.abs(motionX) < 0.3f && Math.abs(motionZ) < 0.3f) - { + if (Math.abs(motionX) < 0.3f && Math.abs(motionZ) < 0.3f) { moveY = 0.15f; motionY = moveY; } } - if (onGround) - { + if (onGround) { motionX *= 0.5D; motionY *= 0.5D; motionZ *= 0.5D; } moveEntity(motionX, moveY, motionZ); - if (!onGround) - { + if (!onGround) { motionX *= getDragAir(); motionY *= getDragAir(); motionZ *= getDragAir(); @@ -1329,38 +1170,27 @@ protected void moveMinecartOffRail (int i, int j, int k) /** * Moved to allow overrides. This code applies fuel consumption. */ - protected void updateFuel () - { - if (fuel > 0) - fuel--; - if (fuel <= 0) - pushX = pushZ = 0.0D; + protected void updateFuel() { + if (fuel > 0) fuel--; + if (fuel <= 0) pushX = pushZ = 0.0D; setMinecartPowered(fuel > 0); } /** * Moved to allow overrides, This code handle slopes affecting velocity. - * + * * @param metadata * The blocks position metadata */ - protected void adjustSlopeVelocities (int metadata) - { + protected void adjustSlopeVelocities(int metadata) { double acceleration = 0.0078125D; - if (metadata == 2) - { + if (metadata == 2) { motionX -= acceleration; - } - else if (metadata == 3) - { + } else if (metadata == 3) { motionX += acceleration; - } - else if (metadata == 4) - { + } else if (metadata == 4) { motionZ += acceleration; - } - else if (metadata == 5) - { + } else if (metadata == 5) { motionZ -= acceleration; } } @@ -1374,99 +1204,78 @@ else if (metadata == 5) * with chunk loading. Carts cant traverse slopes or corners at greater than * 0.5 - 0.6. This value is compared with the rails max speed to determine * the carts current max speed. A normal rails max speed is 0.4. - * + * * @return Carts max speed. */ - public float getMaxSpeedRail () - { + public float getMaxSpeedRail() { return maxSpeedRail; } - public void setMaxSpeedRail (float value) - { + public void setMaxSpeedRail(float value) { maxSpeedRail = value; } - public float getMaxSpeedGround () - { + public float getMaxSpeedGround() { return maxSpeedGround; } - public void setMaxSpeedGround (float value) - { + public void setMaxSpeedGround(float value) { maxSpeedGround = value; } - public float getMaxSpeedAirLateral () - { + public float getMaxSpeedAirLateral() { return maxSpeedAirLateral; } - public void setMaxSpeedAirLateral (float value) - { + public void setMaxSpeedAirLateral(float value) { maxSpeedAirLateral = value; } - public float getMaxSpeedAirVertical () - { + public float getMaxSpeedAirVertical() { return maxSpeedAirVertical; } - public void setMaxSpeedAirVertical (float value) - { + public void setMaxSpeedAirVertical(float value) { maxSpeedAirVertical = value; } - public double getDragAir () - { + public double getDragAir() { return dragAir; } - public void setDragAir (double value) - { + public void setDragAir(double value) { dragAir = value; } @Override - public void writeSpawnData (ByteBuf data) - { + public void writeSpawnData(ByteBuf data) { data.writeInt(pullcartType); - } @Override - public void readSpawnData (ByteBuf data) - { + public void readSpawnData(ByteBuf data) { pullcartType = data.readInt(); - } @Override - public boolean isItemValidForSlot (int i, ItemStack itemstack) - { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return false; } @Override - public String getInventoryName () - { + public String getInventoryName() { // TODO get inventory name return null; } @Override - public boolean hasCustomInventoryName () - { + public boolean hasCustomInventoryName() { return false; } @Override - public void openInventory () - { - } + public void openInventory() {} @Override - public void closeInventory () - { - } + public void closeInventory() {} } diff --git a/src/main/java/tconstruct/world/entity/Crystal.java b/src/main/java/tconstruct/world/entity/Crystal.java index fb8873fa8e4..7dd65a229d6 100644 --- a/src/main/java/tconstruct/world/entity/Crystal.java +++ b/src/main/java/tconstruct/world/entity/Crystal.java @@ -3,13 +3,10 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.world.World; -public class Crystal extends EntityCreeper -{ +public class Crystal extends EntityCreeper { - public Crystal(World par1World) - { + public Crystal(World par1World) { super(par1World); // texture = "/mods/tinker/textures/mob/crystalwater.png"; } - } diff --git a/src/main/java/tconstruct/world/entity/CrystalGuardian.java b/src/main/java/tconstruct/world/entity/CrystalGuardian.java index 750a0ae5995..1e1bcb4a8d9 100644 --- a/src/main/java/tconstruct/world/entity/CrystalGuardian.java +++ b/src/main/java/tconstruct/world/entity/CrystalGuardian.java @@ -3,11 +3,9 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.world.World; -public class CrystalGuardian extends EntityLiving -{ +public class CrystalGuardian extends EntityLiving { - public CrystalGuardian(World par1World) - { + public CrystalGuardian(World par1World) { super(par1World); // this.texture = "/mods/tinker/textures/mob/crystalguardamber.png"; } diff --git a/src/main/java/tconstruct/world/entity/KingBlueSlime.java b/src/main/java/tconstruct/world/entity/KingBlueSlime.java index 70eb0d2f864..6cc1c1e8ce9 100644 --- a/src/main/java/tconstruct/world/entity/KingBlueSlime.java +++ b/src/main/java/tconstruct/world/entity/KingBlueSlime.java @@ -49,17 +49,17 @@ protected boolean canDespawn() { @Override public void setDead() { - if (!this.worldObj.isRemote && this.getHealth() <= 0) - { + if (!this.worldObj.isRemote && this.getHealth() <= 0) { // doesn't break into the next smaller one. let's spawn many tiny slimes instead! :D int c = 15 + this.rand.nextInt(6); - for(; c > 0; c--) { + for (; c > 0; c--) { BlueSlime entityslime = new BlueSlime(this.worldObj); entityslime.setSlimeSize(1); double r = rand.nextDouble() * Math.PI; double x = Math.cos(r); double z = Math.sin(r); - entityslime.setLocationAndAngles(this.posX - 1d + x, this.posY + 0.5D, this.posZ - 1d + z, this.rand.nextFloat() * 360.0F, 0.0F); + entityslime.setLocationAndAngles( + this.posX - 1d + x, this.posY + 0.5D, this.posZ - 1d + z, this.rand.nextFloat() * 360.0F, 0.0F); entityslime.motionX = x; entityslime.motionY = -0.5d - rand.nextDouble(); entityslime.motionZ = z; @@ -78,20 +78,19 @@ protected void dropFewItems(boolean par1, int par2) { final ItemStack headStack = new ItemStack(tool.getHeadItem(), 1, 17); final ItemStack handleStack = new ItemStack(tool.getHandleItem(), 1, 17); - final ItemStack accessoryStack = tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; + final ItemStack accessoryStack = + tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; final ItemStack extraStack = tool.getExtraItem() != null ? new ItemStack(tool.getExtraItem(), 1, 17) : null; - String loc = "tool." + tool.getToolName().toLowerCase() + ".kingslime"; // special localization the same way as materials + String loc = "tool." + tool.getToolName().toLowerCase() + + ".kingslime"; // special localization the same way as materials String name; - if(StatCollector.canTranslate(loc)) - name = StatCollector.translateToLocal(loc); - else - name = StatCollector.translateToLocal("tool.kingslimeprefix") + " " + tool.getLocalizedToolName(); + if (StatCollector.canTranslate(loc)) name = StatCollector.translateToLocal(loc); + else name = StatCollector.translateToLocal("tool.kingslimeprefix") + " " + tool.getLocalizedToolName(); ItemStack toolStack = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, extraStack, name); - if (toolStack != null) - { + if (toolStack != null) { NBTTagCompound tags = toolStack.getTagCompound().getCompoundTag("InfiTool"); tags.setInteger("Attack", 5 + tool.getDamageVsEntity(null)); tags.setInteger("TotalDurability", 2500); @@ -99,19 +98,17 @@ protected void dropFewItems(boolean par1, int par2) { tags.setInteger("MiningSpeed", 1400); this.entityDropItem(toolStack, 0f); - if (rand.nextInt(5) == 0) - { + if (rand.nextInt(5) == 0) { ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1); this.entityDropItem(dropStack, 0f); } } } - ToolCore getValidTool () - { + ToolCore getValidTool() { ToolCore tool = TConstructRegistry.tools.get(rand.nextInt(TConstructRegistry.tools.size())); /*if (tool.getExtraItem() != null) - tool = getValidTool();*/ + tool = getValidTool();*/ return tool; } } diff --git a/src/main/java/tconstruct/world/entity/MetalSlime.java b/src/main/java/tconstruct/world/entity/MetalSlime.java index 4b28c1a1fe4..b267d0ef129 100644 --- a/src/main/java/tconstruct/world/entity/MetalSlime.java +++ b/src/main/java/tconstruct/world/entity/MetalSlime.java @@ -4,99 +4,82 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; -public class MetalSlime extends BlueSlime -{ +public class MetalSlime extends BlueSlime { - public MetalSlime(World world) - { + public MetalSlime(World world) { super(world); // this.texture = "/mods/tinker/textures/mob/slimemetal.png"; this.setHealth(getMaxHealthForSize()); } - public boolean attackEntityFrom (DamageSource damageSource, int damage) - { - if (!damageSource.isExplosion() && damageSource.isProjectile()) - return false; + public boolean attackEntityFrom(DamageSource damageSource, int damage) { + if (!damageSource.isExplosion() && damageSource.isProjectile()) return false; return super.attackEntityFrom(damageSource, damage); } // Invoked by constructor to set max health dependant on current size - protected float getMaxHealthForSize () - { + protected float getMaxHealthForSize() { int i = this.getSlimeSize(); - if (i == 1) - return 4; + if (i == 1) return 4; return (float) Math.min(i * i + 20, 100); } @Override - public int getTotalArmorValue () - { + public int getTotalArmorValue() { return super.getTotalArmorValue() + 12; } @Override - public void setDead () - { + public void setDead() { this.isDead = true; } /* * protected void dropFewItems (boolean par1, int par2) { int j = * this.getDropItemId(); - * + * * if (j > 0) { int k = rand.nextInt(3) + rand.nextInt(this.getSlimeSize()); - * + * * if (par2 > 0) { k += this.rand.nextInt(par2 + 1); } - * + * * for (int l = 0; l < k; ++l) { this.dropItem(j, 1); } } } */ @Override - protected void updateEntityActionState () - { + protected void updateEntityActionState() { this.despawnEntity(); EntityPlayer entityplayer = this.worldObj.getClosestVulnerablePlayerToEntity(this, 16.0D); - if (entityplayer != null) - { + if (entityplayer != null) { this.faceEntity(entityplayer, 10.0F, 20.0F); - } - else if (this.onGround && this.slimeJumpDelay == 1) - { + } else if (this.onGround && this.slimeJumpDelay == 1) { this.rotationYaw = this.rotationYaw + rand.nextFloat() * 180 - 90; - if (rotationYaw > 360) - rotationYaw -= 360; - if (rotationYaw < 0) - rotationYaw += 360; + if (rotationYaw > 360) rotationYaw -= 360; + if (rotationYaw < 0) rotationYaw += 360; } - if (this.onGround && this.slimeJumpDelay-- <= 0) - { + if (this.onGround && this.slimeJumpDelay-- <= 0) { this.slimeJumpDelay = this.getJumpDelay(); - if (entityplayer != null) - { + if (entityplayer != null) { this.slimeJumpDelay /= 3; } this.isJumping = true; - if (this.makesSoundOnJump()) - { - this.playSound(this.getJumpSound(), this.getSoundVolume(), ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F) * 0.8F); + if (this.makesSoundOnJump()) { + this.playSound( + this.getJumpSound(), + this.getSoundVolume(), + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F) * 0.8F); } this.moveStrafing = 1.0F - this.rand.nextFloat() * 2.0F; this.moveForward = (float) (1 * this.getSlimeSize()); - } - else - { + } else { this.isJumping = false; - if (this.onGround) - { + if (this.onGround) { this.moveStrafing = this.moveForward = 0.0F; } } diff --git a/src/main/java/tconstruct/world/entity/SlimeBase.java b/src/main/java/tconstruct/world/entity/SlimeBase.java index f59f8ce15ec..69c4579bf7d 100644 --- a/src/main/java/tconstruct/world/entity/SlimeBase.java +++ b/src/main/java/tconstruct/world/entity/SlimeBase.java @@ -25,42 +25,34 @@ public abstract class SlimeBase extends EntityLiving implements IMob { /** the time between each jump of the slime, used for counting */ protected int slimeJumpDelay = 0; - - public SlimeBase(World world) - { + public SlimeBase(World world) { super(world); initializeSlime(); } - /** Returns the name of the particle used by the slime */ protected abstract String getSlimeParticle(); /** Returns the name of the sound played when the slime jumps. */ - protected String getJumpSound () - { + protected String getJumpSound() { return "mob.slime." + (this.getSlimeSize() > 1 ? "big" : "small"); } /** Returns true if the slime makes a sound when it jumps (based upon the slime's size) */ - protected boolean makesSoundOnJump () - { + protected boolean makesSoundOnJump() { return this.getSlimeSize() > 0; } /** Returns true if the slime makes a sound when it lands after a jump (based upon the slime's size) */ - protected boolean makesSoundOnLand () - { + protected boolean makesSoundOnLand() { return this.getSlimeSize() > 2; } - public int getSlimeSize () - { + public int getSlimeSize() { return this.dataWatcher.getWatchableObjectByte(16); } - public void setSlimeSize (int size) - { + public void setSlimeSize(int size) { this.dataWatcher.updateObject(16, (byte) size); this.setSize(0.6F * (float) size, 0.6F * (float) size); this.setPosition(this.posX, this.posY, this.posZ); @@ -73,18 +65,15 @@ public void setSlimeSize (int size) } /** returns the health for the slime depending on its size */ - protected float getMaxHealthForSize () - { + protected float getMaxHealthForSize() { int i = this.getSlimeSize(); - if (i == 1) - return 4; + if (i == 1) return 4; return (float) Math.min(i * i + 8, 49); } /** Gets the amount of time the slime needs to wait between jumps. */ - protected int getJumpDelay () - { + protected int getJumpDelay() { return this.rand.nextInt(120) + 40; } @@ -92,8 +81,7 @@ protected int getJumpDelay () * Indicates weather the slime is able to damage the player (based upon the * slime's size) */ - protected boolean canDamagePlayer () - { + protected boolean canDamagePlayer() { return this.getSlimeSize() > 1; } @@ -101,8 +89,7 @@ protected boolean canDamagePlayer () * Gets the amount of damage dealt to the player when "attacked" by the * slime. */ - protected int getAttackStrength () - { + protected int getAttackStrength() { return this.getSlimeSize(); } @@ -111,19 +98,11 @@ protected int getAttackStrength () */ protected abstract SlimeBase createInstance(World world); - - - - - protected void initializeSlime() - { + protected void initializeSlime() { int offset = this.rand.nextInt(299); - if (offset < 149) - offset = 1; - else if (offset < 298) - offset = 2; - else - offset = 3; + if (offset < 149) offset = 1; + else if (offset < 298) offset = 2; + else offset = 3; int size = 1 << offset; this.yOffset = 0.0F; this.slimeJumpDelay = this.rand.nextInt(120) + 40; @@ -131,36 +110,36 @@ else if (offset < 298) } @Override - protected void entityInit () - { + protected void entityInit() { super.entityInit(); this.dataWatcher.addObject(16, (byte) 1); } @Override - public void jump () - { + public void jump() { this.motionY = 0.05 * getSlimeSize() + 0.37; - if (this.isPotionActive(Potion.jump)) - { - this.motionY += (double) ((float) (this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F); + if (this.isPotionActive(Potion.jump)) { + this.motionY += + (double) ((float) (this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F); } - if (this.isSprinting()) - { + if (this.isSprinting()) { float f = this.rotationYaw * 0.017453292F; this.motionX -= (double) (MathHelper.sin(f) * 0.2F); this.motionZ += (double) (MathHelper.cos(f) * 0.2F); } - if (!(this instanceof IBossDisplayData) && this.getBrightness(1.0F) > 0.9F && rand.nextInt(5) == 0 && this.worldObj.canBlockSeeTheSky(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ))) - { + if (!(this instanceof IBossDisplayData) + && this.getBrightness(1.0F) > 0.9F + && rand.nextInt(5) == 0 + && this.worldObj.canBlockSeeTheSky( + MathHelper.floor_double(this.posX), + MathHelper.floor_double(this.posY), + MathHelper.floor_double(this.posZ))) { int size = this.getSlimeSize() - 1; - if (size <= 0) - this.kill(); - else - this.setSlimeSize(size); + if (size <= 0) this.kill(); + else this.setSlimeSize(size); } this.isAirBorne = true; @@ -171,10 +150,10 @@ public void jump () * Called to update the entity's position/logic. */ @Override - public void onUpdate () - { - if (!this.worldObj.isRemote && this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL && this.getSlimeSize() > 0) - { + public void onUpdate() { + if (!this.worldObj.isRemote + && this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL + && this.getSlimeSize() > 0) { this.isDead = true; } @@ -184,121 +163,117 @@ public void onUpdate () super.onUpdate(); int i; - if (this.onGround && !flag) - { + if (this.onGround && !flag) { i = this.getSlimeSize(); - for (int j = 0; j < i * 8; ++j) - { + for (int j = 0; j < i * 8; ++j) { float f = this.rand.nextFloat() * (float) Math.PI * 2.0F; float offset = this.rand.nextFloat() * 0.5F + 0.5F; float xPos = MathHelper.sin(f) * (float) i * 0.5F * offset; float zPos = MathHelper.cos(f) * (float) i * 0.5F * offset; - TinkerWorld.proxy.spawnParticle(this.getSlimeParticle(), this.posX + (double) xPos, this.boundingBox.minY, this.posZ + (double) zPos, 0.0D, 0.0D, 0.0D); + TinkerWorld.proxy.spawnParticle( + this.getSlimeParticle(), + this.posX + (double) xPos, + this.boundingBox.minY, + this.posZ + (double) zPos, + 0.0D, + 0.0D, + 0.0D); } - if (this.makesSoundOnLand()) - { - this.playSound(this.getJumpSound(), this.getSoundVolume(), ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F) / 0.8F); + if (this.makesSoundOnLand()) { + this.playSound( + this.getJumpSound(), + this.getSoundVolume(), + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F) / 0.8F); } this.sizeOffset = -0.5F; - } - else if (!this.onGround && flag) - { + } else if (!this.onGround && flag) { this.sizeOffset = 1.0F; } this.alterSquishAmount(); - if (this.worldObj.isRemote) - { + if (this.worldObj.isRemote) { i = this.getSlimeSize(); this.setSize(0.6F * (float) i, 0.6F * (float) i); } } - protected void alterSquishAmount () - { + protected void alterSquishAmount() { this.sizeOffset *= 0.6F; } @Override - protected void updateEntityActionState () - { + protected void updateEntityActionState() { this.despawnEntity(); EntityPlayer entityplayer = this.worldObj.getClosestVulnerablePlayerToEntity(this, 16.0D); - if (entityplayer != null) - { + if (entityplayer != null) { this.faceEntity(entityplayer, 10.0F, 20.0F); - } - else if (this.onGround && this.slimeJumpDelay == 1) - { + } else if (this.onGround && this.slimeJumpDelay == 1) { this.rotationYaw = this.rotationYaw + rand.nextFloat() * 180 - 90; - if (rotationYaw > 360) - rotationYaw -= 360; - if (rotationYaw < 0) - rotationYaw += 360; + if (rotationYaw > 360) rotationYaw -= 360; + if (rotationYaw < 0) rotationYaw += 360; } - if (this.onGround && this.slimeJumpDelay-- <= 0) - { + if (this.onGround && this.slimeJumpDelay-- <= 0) { this.slimeJumpDelay = this.getJumpDelay(); - if (entityplayer != null) - { + if (entityplayer != null) { this.slimeJumpDelay /= 12; } this.isJumping = true; - if (this.makesSoundOnJump()) - { - this.playSound(this.getJumpSound(), this.getSoundVolume(), ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F) * 0.8F); + if (this.makesSoundOnJump()) { + this.playSound( + this.getJumpSound(), + this.getSoundVolume(), + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F) * 0.8F); } this.moveStrafing = 1.0F - this.rand.nextFloat() * 2.0F; this.moveForward = (float) this.getSlimeSize(); - } - else - { + } else { this.isJumping = false; - if (this.onGround) - { + if (this.onGround) { this.moveStrafing = this.moveForward = 0.0F; } } } @Override - public void onCollideWithPlayer (EntityPlayer par1EntityPlayer) - { - if (this.canDamagePlayer()) - { + public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) { + if (this.canDamagePlayer()) { int i = this.getSlimeSize(); - if (this.canEntityBeSeen(par1EntityPlayer) && this.getDistanceSqToEntity(par1EntityPlayer) < 0.6D * (double) i * 0.6D * (double) i && par1EntityPlayer.attackEntityFrom(DamageSource.causeMobDamage(this), this.getAttackStrength())) - { + if (this.canEntityBeSeen(par1EntityPlayer) + && this.getDistanceSqToEntity(par1EntityPlayer) < 0.6D * (double) i * 0.6D * (double) i + && par1EntityPlayer.attackEntityFrom(DamageSource.causeMobDamage(this), this.getAttackStrength())) { this.playSound("mob.attack", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); } } } @Override - public void setDead () - { + public void setDead() { int size = this.getSlimeSize(); - if (!this.worldObj.isRemote && size > 1 && this.getHealth() <= 0 && size < 8) - { + if (!this.worldObj.isRemote && size > 1 && this.getHealth() <= 0 && size < 8) { float f = (-0.5F) * (float) size / 4.0F; float f1 = (-0.5F) * (float) size / 4.0F; SlimeBase entityslime = this.createInstance(this.worldObj); entityslime.setSlimeSize(size / 2); - entityslime.setLocationAndAngles(this.posX + (double) f, this.posY + 0.5D, this.posZ + (double) f1, this.rand.nextFloat() * 360.0F, 0.0F); + entityslime.setLocationAndAngles( + this.posX + (double) f, + this.posY + 0.5D, + this.posZ + (double) f1, + this.rand.nextFloat() * 360.0F, + 0.0F); this.worldObj.spawnEntityInWorld(entityslime); } @@ -307,56 +282,49 @@ public void setDead () // Drops items depending on slime size @Override - protected void dropFewItems (boolean par1, int par2) - { + protected void dropFewItems(boolean par1, int par2) { int size = this.getSlimeSize(); Item j = this.getDropItem(); - if (j != null && (rand.nextInt(2) == 0) || size >= 8) - { + if (j != null && (rand.nextInt(2) == 0) || size >= 8) { int k = rand.nextInt(3) + rand.nextInt(this.getSlimeSize()); - if (par2 > 0) - { + if (par2 > 0) { k += this.rand.nextInt(par2 + 1); } - for (int l = 0; l < k; ++l) - { + for (int l = 0; l < k; ++l) { this.entityDropItem(new ItemStack(j), 1); } } } @Override - protected void fall (float distance) - { + protected void fall(float distance) { // we call the event for proper behaviour with other stuff ForgeHooks.onLivingFall(this, distance); // but don't calc damage or anything } @Override - public boolean getCanSpawnHere () - { + public boolean getCanSpawnHere() { // needs free space - if(!this.worldObj.checkNoEntityCollision(this.boundingBox) || !this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() || this.worldObj.isAnyLiquid(this.boundingBox)) - return false; + if (!this.worldObj.checkNoEntityCollision(this.boundingBox) + || !this.worldObj + .getCollidingBoundingBoxes(this, this.boundingBox) + .isEmpty() + || this.worldObj.isAnyLiquid(this.boundingBox)) return false; int x = MathHelper.floor_double(this.posX); int y = MathHelper.floor_double(this.boundingBox.minY); int z = MathHelper.floor_double(this.posZ); - if (this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, x, y, z) > this.rand.nextInt(32)) - { + if (this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, x, y, z) > this.rand.nextInt(32)) { return false; - } - else - { + } else { int light = this.worldObj.getBlockLightValue(x, y, z); - if (this.worldObj.isThundering()) - { + if (this.worldObj.isThundering()) { int i1 = this.worldObj.skylightSubtracted; this.worldObj.skylightSubtracted = 10; light = this.worldObj.getBlockLightValue(x, y, z); @@ -369,8 +337,7 @@ public boolean getCanSpawnHere () // slime jockeys! @Override - public double getMountedYOffset() - { + public double getMountedYOffset() { return this.height * 0.3; } @@ -378,8 +345,7 @@ public double getMountedYOffset() * Returns the sound this mob makes when it is hurt. */ @Override - protected String getHurtSound () - { + protected String getHurtSound() { return getJumpSound(); } @@ -387,8 +353,7 @@ protected String getHurtSound () * Returns the sound this mob makes on death. */ @Override - protected String getDeathSound () - { + protected String getDeathSound() { return getJumpSound(); } @@ -396,14 +361,12 @@ protected String getDeathSound () * Returns the volume for the sounds this mob makes. */ @Override - protected float getSoundVolume () - { + protected float getSoundVolume() { return Math.min(0.05F * (float) this.getSlimeSize(), 0.3f); } @Override - public int getVerticalFaceSpeed () - { + public int getVerticalFaceSpeed() { return 0; } @@ -411,8 +374,7 @@ public int getVerticalFaceSpeed () * (abstract) Protected helper method to write subclass entity data to NBT. */ @Override - public void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) - { + public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { super.writeEntityToNBT(par1NBTTagCompound); par1NBTTagCompound.setInteger("Size", this.getSlimeSize() - 1); } @@ -421,8 +383,7 @@ public void writeEntityToNBT (NBTTagCompound par1NBTTagCompound) * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override - public void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) - { + public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { super.readEntityFromNBT(par1NBTTagCompound); this.setSlimeSize(par1NBTTagCompound.getInteger("Size") + 1); } diff --git a/src/main/java/tconstruct/world/gen/OreberryBushGen.java b/src/main/java/tconstruct/world/gen/OreberryBushGen.java index a9786888432..f715094aa09 100644 --- a/src/main/java/tconstruct/world/gen/OreberryBushGen.java +++ b/src/main/java/tconstruct/world/gen/OreberryBushGen.java @@ -6,21 +6,28 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -public class OreberryBushGen extends WorldGenerator -{ +public class OreberryBushGen extends WorldGenerator { private Block blockB; private int metadata; int chance; private Block[] replaceBlocks; - public OreberryBushGen(Block block, int meta, int chance) - { - this(block, meta, chance, Blocks.stone, (Block) Blocks.grass, Blocks.dirt, Blocks.water, Blocks.sand, Blocks.gravel, Blocks.snow); + public OreberryBushGen(Block block, int meta, int chance) { + this( + block, + meta, + chance, + Blocks.stone, + (Block) Blocks.grass, + Blocks.dirt, + Blocks.water, + Blocks.sand, + Blocks.gravel, + Blocks.snow); blockB = block; } - public OreberryBushGen(Block block, int meta, int chance, Block... target) - { + public OreberryBushGen(Block block, int meta, int chance, Block... target) { blockB = block; metadata = meta; this.chance = chance; @@ -28,85 +35,61 @@ public OreberryBushGen(Block block, int meta, int chance, Block... target) } @Override - public boolean generate (World world, Random random, int x, int y, int z) - { + public boolean generate(World world, Random random, int x, int y, int z) { int type = random.nextInt(chance); - if (type == 11) - generateMediumNode(world, random, x, y, z); - else if (type >= 5) - generateSmallNode(world, random, x, y, z); - else - generateTinyNode(world, random, x, y, z); + if (type == 11) generateMediumNode(world, random, x, y, z); + else if (type >= 5) generateSmallNode(world, random, x, y, z); + else generateTinyNode(world, random, x, y, z); return true; } - public void generateMediumNode (World world, Random random, int x, int y, int z) - { + public void generateMediumNode(World world, Random random, int x, int y, int z) { for (int xPos = -1; xPos <= 1; xPos++) for (int yPos = -1; yPos <= 1; yPos++) for (int zPos = -1; zPos <= 1; zPos++) - if (random.nextInt(4) == 0) - generateBerryBlock(world, x + xPos, y + yPos, z + zPos, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x + xPos, y + yPos, z + zPos, random); generateSmallNode(world, random, x, y, z); } - public void generateSmallNode (World world, Random random, int x, int y, int z) - { + public void generateSmallNode(World world, Random random, int x, int y, int z) { generateBerryBlock(world, x, y, z, random); - if (random.nextBoolean()) - generateBerryBlock(world, x + 1, y, z, random); - if (random.nextBoolean()) - generateBerryBlock(world, x - 1, y, z, random); - if (random.nextBoolean()) - generateBerryBlock(world, x, y, z + 1, random); - if (random.nextBoolean()) - generateBerryBlock(world, x, y, z - 1, random); - if (random.nextBoolean()) - generateBerryBlock(world, x, y + 1, z, random); - if (random.nextBoolean()) - generateBerryBlock(world, x, y + 1, z, random); + if (random.nextBoolean()) generateBerryBlock(world, x + 1, y, z, random); + if (random.nextBoolean()) generateBerryBlock(world, x - 1, y, z, random); + if (random.nextBoolean()) generateBerryBlock(world, x, y, z + 1, random); + if (random.nextBoolean()) generateBerryBlock(world, x, y, z - 1, random); + if (random.nextBoolean()) generateBerryBlock(world, x, y + 1, z, random); + if (random.nextBoolean()) generateBerryBlock(world, x, y + 1, z, random); } - public void generateTinyNode (World world, Random random, int x, int y, int z) - { + public void generateTinyNode(World world, Random random, int x, int y, int z) { generateBerryBlock(world, x, y, z, random); - if (random.nextInt(4) == 0) - generateBerryBlock(world, x + 1, y, z, random); - if (random.nextInt(4) == 0) - generateBerryBlock(world, x - 1, y, z, random); - if (random.nextInt(4) == 0) - generateBerryBlock(world, x, y, z + 1, random); - if (random.nextInt(4) == 0) - generateBerryBlock(world, x, y, z - 1, random); - if (random.nextInt(4) == 0) - generateBerryBlock(world, x, y + 1, z, random); - if (random.nextInt(4) == 0) - generateBerryBlock(world, x, y + 1, z, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x + 1, y, z, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x - 1, y, z, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x, y, z + 1, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x, y, z - 1, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x, y + 1, z, random); + if (random.nextInt(4) == 0) generateBerryBlock(world, x, y + 1, z, random); } - void generateBerryBlock (World world, int x, int y, int z, Random random) - { + void generateBerryBlock(World world, int x, int y, int z, Random random) { /* * if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)]) { * setBlockAndMetadata(world, x, y, z, blockID, metadata); } */ Block block = world.getBlock(x, y, z); - if (block == null || (block != Blocks.end_portal_frame && !world.getBlock(x, y, z).func_149730_j())) + if (block == null + || (block != Blocks.end_portal_frame && !world.getBlock(x, y, z).func_149730_j())) world.setBlock(x, y, z, this.blockB, metadata, 2); - else - { - for (int iter = 0; iter < replaceBlocks.length; iter++) - { - if (world.getBlock(x, y, z).isReplaceableOreGen(world, x, y, z, replaceBlocks[iter])) - { + else { + for (int iter = 0; iter < replaceBlocks.length; iter++) { + if (world.getBlock(x, y, z).isReplaceableOreGen(world, x, y, z, replaceBlocks[iter])) { world.setBlock(x, y, z, this.blockB, metadata, 2); break; } } } - } } diff --git a/src/main/java/tconstruct/world/gen/OverworldProvider.java b/src/main/java/tconstruct/world/gen/OverworldProvider.java index 5f929d97b06..86b2a845866 100644 --- a/src/main/java/tconstruct/world/gen/OverworldProvider.java +++ b/src/main/java/tconstruct/world/gen/OverworldProvider.java @@ -2,34 +2,28 @@ import net.minecraft.world.WorldProvider; -public class OverworldProvider extends WorldProvider -{ +public class OverworldProvider extends WorldProvider { @Override - public String getDimensionName () - { + public String getDimensionName() { return "Overworld"; } @Override - public boolean getWorldHasVoidParticles () - { + public boolean getWorldHasVoidParticles() { return this.terrainType.hasVoidParticles(this.hasNoSky); } @Override - public float calculateCelestialAngle (long worldtime, float par3) - { + public float calculateCelestialAngle(long worldtime, float par3) { int timeOfDay = 18000; float f1 = ((float) timeOfDay + par3) / 24000.0F - 0.25F; - if (f1 < 0.0F) - { + if (f1 < 0.0F) { ++f1; } - if (f1 > 1.0F) - { + if (f1 > 1.0F) { --f1; } @@ -43,14 +37,14 @@ public float calculateCelestialAngle (long worldtime, float par3) * public float calculateCelestialAngle(long worldtime, float par3) { int * timeOfDay = (int)(worldtime % 43200L); float f1 = ((float)timeOfDay + * par3) / 43200.0F - 0.25F; - * + * * if (f1 < 0.0F) { ++f1; } - * + * * if (f1 > 1.0F) { --f1; } - * + * * float f2 = f1; f1 = 1.0F - (float)((Math.cos((double)f1 * Math.PI) + * 1.0D) / 2.0D); f1 = f2 + (f1 - f2) / 3.0F; return f1; } - * + * * public int getMoonPhase(long par1) { return (int)(par1 / 43200L) % 8; } */ } diff --git a/src/main/java/tconstruct/world/gen/PlantGen.java b/src/main/java/tconstruct/world/gen/PlantGen.java index 6ae313ae50e..9a5b85f5f41 100644 --- a/src/main/java/tconstruct/world/gen/PlantGen.java +++ b/src/main/java/tconstruct/world/gen/PlantGen.java @@ -6,10 +6,10 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -public class PlantGen extends WorldGenerator -{ +public class PlantGen extends WorldGenerator { /** The ID of the plant block used in this plant generator. */ public final Block plant; + public final int metadata; public int chances = 64; int xSize = 8; @@ -17,14 +17,12 @@ public class PlantGen extends WorldGenerator int zSize = 8; boolean clumped = true; - public PlantGen(Block b, int meta) - { + public PlantGen(Block b, int meta) { this.plant = b; this.metadata = meta; } - public PlantGen(Block b, int meta, int count, int range, int height, int width, boolean clumped) - { + public PlantGen(Block b, int meta, int count, int range, int height, int width, boolean clumped) { this.plant = b; this.metadata = meta; this.chances = count; @@ -35,20 +33,19 @@ public PlantGen(Block b, int meta, int count, int range, int height, int width, } @Override - public boolean generate (World world, Random random, int x, int y, int z) - { - for (int iter = 0; iter < chances; ++iter) - { + public boolean generate(World world, Random random, int x, int y, int z) { + for (int iter = 0; iter < chances; ++iter) { int posX = clumped ? x + random.nextInt(xSize) - random.nextInt(xSize) : x + random.nextInt(xSize); int posY = clumped ? y + random.nextInt(ySize) - random.nextInt(ySize) : y + random.nextInt(ySize); int posZ = clumped ? z + random.nextInt(zSize) - random.nextInt(zSize) : z + random.nextInt(zSize); - if (world.getBlock(posX, posY, posZ) == Blocks.air && (!world.provider.hasNoSky || posY < 127) && this.plant.canBlockStay(world, posX, posY, posZ)) - { + if (world.getBlock(posX, posY, posZ) == Blocks.air + && (!world.provider.hasNoSky || posY < 127) + && this.plant.canBlockStay(world, posX, posY, posZ)) { world.setBlock(posX, posY, posZ, this.plant, this.metadata, 2); } } return true; } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java index e7d00a94db9..8afb3feee2e 100644 --- a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -1,16 +1,12 @@ package tconstruct.world.gen; -import com.google.common.collect.Sets; import cpw.mods.fml.common.IWorldGenerator; import java.awt.geom.Ellipse2D; import java.util.Random; -import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.*; -import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; import net.minecraft.world.gen.feature.WorldGenerator; @@ -18,42 +14,43 @@ import tconstruct.util.config.*; import tconstruct.world.TinkerWorld; -public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator -{ +public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { private Block liquidBlock; private int gelMeta; int randomness = 2; Random random = new Random(); - Block base = TinkerTools.craftedSoil;// Block.dirt.blockID; + Block base = TinkerTools.craftedSoil; // Block.dirt.blockID; Block top = TinkerWorld.slimeGrass; SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0); - public SlimeIslandGen(Block slimePool, int meta) - { + public SlimeIslandGen(Block slimePool, int meta) { this.liquidBlock = slimePool; this.gelMeta = meta; } @Override - public void generate (Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) // IWorldGenerator - // version - { + public void generate( + Random random, + int chunkX, + int chunkZ, + World world, + IChunkProvider chunkGenerator, + IChunkProvider chunkProvider) // IWorldGenerator + // version + { // dim 0 only? - if ((chunkGenerator instanceof ChunkProviderFlat || world.provider.terrainType == WorldType.FLAT) && !PHConstruct.genIslandsFlat) - { + if ((chunkGenerator instanceof ChunkProviderFlat || world.provider.terrainType == WorldType.FLAT) + && !PHConstruct.genIslandsFlat) { return; } - if (DimensionBlacklist.isDimInBlacklist(world.provider.dimensionId)) - { - if (random.nextInt(PHConstruct.islandRarity) == 0) - generateIsland(world, random, chunkX * 16, chunkZ * 16); + if (DimensionBlacklist.isDimInBlacklist(world.provider.dimensionId)) { + if (random.nextInt(PHConstruct.islandRarity) == 0) generateIsland(world, random, chunkX * 16, chunkZ * 16); } } // Island is biased towards one direction. Quadrants would be more useful - public void generateIsland (World world, Random rand, int xChunk, int zChunk) - { + public void generateIsland(World world, Random rand, int xChunk, int zChunk) { int xRange = random.nextInt(13) + 20; int yCenter = 50 + world.getHeightValue(xChunk, zChunk) + random.nextInt(50); int zRange = random.nextInt(13) + 20; @@ -62,14 +59,10 @@ public void generateIsland (World world, Random rand, int xChunk, int zChunk) Ellipse2D.Double ellipse = new Ellipse2D.Double(0, 0, xRange, zRange); // Basic shape - for (int x = 0; x <= xRange; x++) - { - for (int z = 0; z <= zRange; z++) - { - for (int y = 0; y <= height; y++) - { - if (ellipse.contains(x, z)) - { + for (int x = 0; x <= xRange; x++) { + for (int z = 0; z <= zRange; z++) { + for (int y = 0; y <= height; y++) { + if (ellipse.contains(x, z)) { world.setBlock(x + xChunk, y + yCenter, z + zChunk, base, 5, 2); } } @@ -78,23 +71,20 @@ public void generateIsland (World world, Random rand, int xChunk, int zChunk) // Erode bottom height = 8; - for (int x = 0; x <= xRange; x++) - { - for (int z = 0; z <= zRange; z++) - { - for (int y = 0; y >= -height; y--) - { + for (int x = 0; x <= xRange; x++) { + for (int z = 0; z <= zRange; z++) { + for (int y = 0; y >= -height; y--) { int xPos = x + xChunk; int yPos = y + yCenter + height; int zPos = z + zChunk; - if (world.getBlock(xPos - 1, yPos + 1, zPos) == base && world.getBlock(xPos + 1, yPos + 1, zPos) == base && world.getBlock(xPos, yPos + 1, zPos - 1) == base && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base && random.nextInt(100) > randomness) - { + if (world.getBlock(xPos - 1, yPos + 1, zPos) == base + && world.getBlock(xPos + 1, yPos + 1, zPos) == base + && world.getBlock(xPos, yPos + 1, zPos - 1) == base + && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base + && random.nextInt(100) > randomness) { ; - } - else - { + } else { world.setBlock(xPos, yPos, zPos, Blocks.air, 0, 2); - } } } @@ -102,21 +92,18 @@ public void generateIsland (World world, Random rand, int xChunk, int zChunk) // Erode top height = 3; - for (int x = 0; x <= xRange; x++) - { - for (int z = 0; z <= zRange; z++) - { - for (int y = 1; y <= height; y++) - { + for (int x = 0; x <= xRange; x++) { + for (int z = 0; z <= zRange; z++) { + for (int y = 1; y <= height; y++) { int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height + 1; int zPos = z + zChunk; - if (world.getBlock(xPos - 1, yPos - 1, zPos) == base && world.getBlock(xPos + 1, yPos - 1, zPos) == base && world.getBlock(xPos, yPos - 1, zPos - 1) == base && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) - { + if (world.getBlock(xPos - 1, yPos - 1, zPos) == base + && world.getBlock(xPos + 1, yPos - 1, zPos) == base + && world.getBlock(xPos, yPos - 1, zPos - 1) == base + && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) { ; - } - else - { + } else { world.setBlock(xPos, yPos, zPos, Blocks.air, 0, 2); } } @@ -124,53 +111,49 @@ public void generateIsland (World world, Random rand, int xChunk, int zChunk) } // Replace blocks - for (int x = 0; x <= xRange; x++) - { - for (int z = 0; z <= zRange; z++) - { - for (int y = 0; y <= height; y++) - { + for (int x = 0; x <= xRange; x++) { + for (int z = 0; z <= zRange; z++) { + for (int y = 0; y <= height; y++) { int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height; int zPos = z + zChunk; - if (world.getBlock(xPos, yPos, zPos) == base) - { + if (world.getBlock(xPos, yPos, zPos) == base) { Block block = world.getBlock(xPos, yPos + 1, zPos); - if (block == null || block == Blocks.air) - world.setBlock(xPos, yPos, zPos, top, 0, 2); + if (block == null || block == Blocks.air) world.setBlock(xPos, yPos, zPos, top, 0, 2); } } } } // Decorate - if (!DimensionBlacklist.isDimNoPool(world.provider.dimensionId)) - { + if (!DimensionBlacklist.isDimNoPool(world.provider.dimensionId)) { generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2); } PlantGen tallGrass = new PlantGen(TinkerWorld.slimeTallGrass, 0, 128, xRange, 1, zRange, false); tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk); - for (int i = 0; i < 3; i++) - { - trees.generate(world, random, xChunk + random.nextInt(xRange), yCenter + initialHeight + 3, zChunk + random.nextInt(zRange)); + for (int i = 0; i < 3; i++) { + trees.generate( + world, + random, + xChunk + random.nextInt(xRange), + yCenter + initialHeight + 3, + zChunk + random.nextInt(zRange)); } } - public void generateSlimePool (World world, Random rand, int x, int y, int z) - { + public void generateSlimePool(World world, Random rand, int x, int y, int z) { this.generate(world, rand, x, y, z); - } @Override - public boolean generate (World world, Random rand, int x, int y, int z) // WorldGenerator - // version - { + public boolean generate(World world, Random rand, int x, int y, int z) // WorldGenerator + // version + { x -= 8; z -= 8; /* * for (z -= 8; y > 5 && world.isAirBlock(x, y, z); --y) { ; } - * + * * if (y <= 4) { return false; } else { */ y -= 4; @@ -178,8 +161,7 @@ public boolean generate (World world, Random rand, int x, int y, int z) // World int var7 = rand.nextInt(4) + 4; int xPos; - for (xPos = 0; xPos < var7; ++xPos) - { + for (xPos = 0; xPos < var7; ++xPos) { double noise1 = rand.nextDouble() * 6.0D + 3.0D; double noise2 = rand.nextDouble() * 4.0D + 2.0D; double noise3 = rand.nextDouble() * 6.0D + 3.0D; @@ -187,19 +169,15 @@ public boolean generate (World world, Random rand, int x, int y, int z) // World double noise5 = rand.nextDouble() * (8.0D - noise2 - 4.0D) + 2.0D + noise2 / 2.0D; double noise6 = rand.nextDouble() * (16.0D - noise3 - 2.0D) + 1.0D + noise3 / 2.0D; - for (int xIter = 1; xIter < 15; ++xIter) - { - for (int zIter = 1; zIter < 15; ++zIter) - { - for (int yIter = 1; yIter < 7; ++yIter) - { + for (int xIter = 1; xIter < 15; ++xIter) { + for (int zIter = 1; zIter < 15; ++zIter) { + for (int yIter = 1; yIter < 7; ++yIter) { double var24 = ((double) xIter - noise4) / (noise1 / 2.0D); double var26 = ((double) yIter - noise5) / (noise2 / 2.0D); double var28 = ((double) zIter - noise6) / (noise3 / 2.0D); double validSpot = var24 * var24 + var26 * var26 + var28 * var28; - if (validSpot < 1.0D) - { + if (validSpot < 1.0D) { validLocations[(xIter * 16 + zIter) * 8 + yIter] = true; } } @@ -211,25 +189,28 @@ public boolean generate (World world, Random rand, int x, int y, int z) // World int zPos; boolean var33; - for (xPos = 0; xPos < 16; ++xPos) - { - for (zPos = 0; zPos < 16; ++zPos) - { - for (yPos = 0; yPos < 8; ++yPos) - { - var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); + for (xPos = 0; xPos < 16; ++xPos) { + for (zPos = 0; zPos < 16; ++zPos) { + for (yPos = 0; yPos < 8; ++yPos) { + var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] + && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] + || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] + || zPos < 15 && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] + || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] + || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] + || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); - if (var33) - { - Material var12 = world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial(); + if (var33) { + Material var12 = + world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial(); - if (yPos >= 4 && var12.isLiquid()) - { + if (yPos >= 4 && var12.isLiquid()) { return false; } - if (yPos < 4 && !var12.isSolid() && world.getBlock(x + xPos, y + yPos, z + zPos) != this.liquidBlock) - { + if (yPos < 4 + && !var12.isSolid() + && world.getBlock(x + xPos, y + yPos, z + zPos) != this.liquidBlock) { return false; } } @@ -237,28 +218,22 @@ public boolean generate (World world, Random rand, int x, int y, int z) // World } } - for (xPos = 0; xPos < 16; ++xPos) - { - for (zPos = 0; zPos < 16; ++zPos) - { - for (yPos = 0; yPos < 8; ++yPos) - { - if (validLocations[(xPos * 16 + zPos) * 8 + yPos]) - { + for (xPos = 0; xPos < 16; ++xPos) { + for (zPos = 0; zPos < 16; ++zPos) { + for (yPos = 0; yPos < 8; ++yPos) { + if (validLocations[(xPos * 16 + zPos) * 8 + yPos]) { world.setBlock(x + xPos, y + yPos, z + zPos, yPos >= 4 ? Blocks.air : this.liquidBlock); } } } } - for (xPos = 0; xPos < 16; ++xPos) - { - for (zPos = 0; zPos < 16; ++zPos) - { - for (yPos = 4; yPos < 8; ++yPos) - { - if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlock(x + xPos, y + yPos - 1, z + zPos) == base && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) - { + for (xPos = 0; xPos < 16; ++xPos) { + for (zPos = 0; zPos < 16; ++zPos) { + for (yPos = 4; yPos < 8; ++yPos) { + if (validLocations[(xPos * 16 + zPos) * 8 + yPos] + && world.getBlock(x + xPos, y + yPos - 1, z + zPos) == base + && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) { world.setBlock(x + xPos, y + yPos - 1, z + zPos, top, 0, 2); } } @@ -266,18 +241,26 @@ public boolean generate (World world, Random rand, int x, int y, int z) // World } // Generate blocks around - if (this.liquidBlock.getMaterial() == Material.water) - { - for (xPos = 0; xPos < 16; ++xPos) - { - for (zPos = 0; zPos < 16; ++zPos) - { - for (yPos = 0; yPos < 8; ++yPos) - { - var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); + if (this.liquidBlock.getMaterial() == Material.water) { + for (xPos = 0; xPos < 16; ++xPos) { + for (zPos = 0; zPos < 16; ++zPos) { + for (yPos = 0; yPos < 8; ++yPos) { + var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] + && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] + || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] + || zPos < 15 && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] + || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] + || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] + || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); - if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial().isSolid() && world.getBlock(x + xPos, y + yPos + 1, z + zPos).getMaterial() != Material.water) - { + if (var33 + && (yPos < 4 || rand.nextInt(2) != 0) + && world.getBlock(x + xPos, y + yPos, z + zPos) + .getMaterial() + .isSolid() + && world.getBlock(x + xPos, y + yPos + 1, z + zPos) + .getMaterial() + != Material.water) { world.setBlock(x + xPos, y + yPos, z + zPos, TinkerWorld.slimeGel, gelMeta, 2); } } diff --git a/src/main/java/tconstruct/world/gen/SlimeTreeGen.java b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java index e504115dde1..dbce672a930 100644 --- a/src/main/java/tconstruct/world/gen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java @@ -9,8 +9,7 @@ import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -public class SlimeTreeGen extends WorldGenerator -{ +public class SlimeTreeGen extends WorldGenerator { public final int minTreeHeight; public final int treeHeightRange; public final int metaWood; @@ -18,8 +17,7 @@ public class SlimeTreeGen extends WorldGenerator public final boolean seekHeight; public final boolean notify; - public SlimeTreeGen(boolean notify, int treeHeight, int treeRange, int woodMeta, int leavesMeta) - { + public SlimeTreeGen(boolean notify, int treeHeight, int treeRange, int woodMeta, int leavesMeta) { super(notify); this.notify = notify; this.minTreeHeight = treeHeight; @@ -30,26 +28,22 @@ public SlimeTreeGen(boolean notify, int treeHeight, int treeRange, int woodMeta, } @Override - public boolean generate (World world, Random random, int xPos, int yPos, int zPos) - { + public boolean generate(World world, Random random, int xPos, int yPos, int zPos) { int height = random.nextInt(this.treeHeightRange) + this.minTreeHeight; boolean flag = true; - if (seekHeight) - { + if (seekHeight) { yPos = findGround(world, xPos, yPos, zPos); - if (yPos == -1) - return false; + if (yPos == -1) return false; } - if (yPos >= 1 && yPos + height + 1 <= 256) - { + if (yPos >= 1 && yPos + height + 1 <= 256) { Block soil = world.getBlock(xPos, yPos - 1, zPos); - boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TinkerWorld.slimeSapling)); + boolean isSoil = (soil != null + && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TinkerWorld.slimeSapling)); - if (isSoil) - { - //TODO Fix this for 1.7 - //if (!checkClear(world, xPos, yPos, zPos, height)) + if (isSoil) { + // TODO Fix this for 1.7 + // if (!checkClear(world, xPos, yPos, zPos, height)) // return false; soil.onPlantGrow(world, xPos, yPos - 1, zPos, xPos, yPos, zPos); @@ -61,39 +55,32 @@ public boolean generate (World world, Random random, int xPos, int yPos, int zPo return false; } - boolean checkClear (World world, int x, int y, int z, int treeHeight) - { - for (int yPos = 0; yPos < treeHeight + 1; yPos++) - { + boolean checkClear(World world, int x, int y, int z, int treeHeight) { + for (int yPos = 0; yPos < treeHeight + 1; yPos++) { int range = 1; - if (yPos == 0) - range = 0; - else if (yPos >= treeHeight - 1) - range = 2; + if (yPos == 0) range = 0; + else if (yPos >= treeHeight - 1) range = 2; - for (int xPos = range; xPos <= range; xPos++) - { - for (int zPos = range; zPos <= range; zPos++) - { + for (int xPos = range; xPos <= range; xPos++) { + for (int zPos = range; zPos <= range; zPos++) { Block blockID = world.getBlock(x + xPos, y + yPos, z + zPos); - if (blockID != null && blockID != TinkerWorld.slimeSapling && !blockID.isLeaves(world, x + xPos, y + yPos, z + zPos)) - return false; + if (blockID != null + && blockID != TinkerWorld.slimeSapling + && !blockID.isLeaves(world, x + xPos, y + yPos, z + zPos)) return false; } } } return true; } - int findGround (World world, int x, int y, int z) - { + int findGround(World world, int x, int y, int z) { int ret = -1; int height = y; - do - { + do { Block heightID = world.getBlock(x, height, z); - if ((heightID == TinkerTools.craftedSoil || heightID == TinkerWorld.slimeGrass) && !world.getBlock(x, height + 1, z).isOpaqueCube()) - { + if ((heightID == TinkerTools.craftedSoil || heightID == TinkerWorld.slimeGrass) + && !world.getBlock(x, height + 1, z).isOpaqueCube()) { ret = height + 1; break; } @@ -102,10 +89,8 @@ int findGround (World world, int x, int y, int z) return ret; } - void placeCanopy (World world, Random random, int xPos, int yPos, int zPos, int height) - { - for (int i = 0; i < 4; i++) - { + void placeCanopy(World world, Random random, int xPos, int yPos, int zPos, int height) { + for (int i = 0; i < 4; i++) { placeDiamondLayer(world, xPos, yPos + height - i, zPos, i + 1); } @@ -118,66 +103,62 @@ void placeCanopy (World world, Random random, int xPos, int yPos, int zPos, int this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos + 1, Blocks.air, 0); this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, Blocks.air, 0); - //Drippers + // Drippers this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos + 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos + 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos - 2, yPos + height - 4, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos - 2, yPos + height - 4, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TinkerWorld.slimeLeaves, this.metaLeaves); this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos + 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos + 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos - 2, yPos + height - 5, zPos + 2, TinkerWorld.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata( + world, xPos - 2, yPos + height - 5, zPos - 2, TinkerWorld.slimeLeaves, this.metaLeaves); } - void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range) - { - for (int x = -range; x <= range; x++) - { - for (int z = -range; z <= range; z++) - { - if (Math.abs(x) + Math.abs(z) <= range) - { + void placeDiamondLayer(World world, int xPos, int yPos, int zPos, int range) { + for (int x = -range; x <= range; x++) { + for (int z = -range; z <= range; z++) { + if (Math.abs(x) + Math.abs(z) <= range) { this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TinkerWorld.slimeLeaves, this.metaLeaves); } } } } - void placeTrunk (World world, int xPos, int yPos, int zPos, int height) - { - for (int localHeight = 0; localHeight < height; ++localHeight) - { + void placeTrunk(World world, int xPos, int yPos, int zPos, int height) { + for (int localHeight = 0; localHeight < height; ++localHeight) { Block blockID = world.getBlock(xPos, yPos + localHeight, zPos); - if (blockID == Blocks.air || blockID == null || blockID.isLeaves(world, xPos, yPos + localHeight, zPos)) - { + if (blockID == Blocks.air || blockID == null || blockID.isLeaves(world, xPos, yPos + localHeight, zPos)) { this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TinkerWorld.slimeGel, this.metaWood); } } } - protected void setBlockAndMetadata (World world, int x, int y, int z, Block blockID, int blockMeta) - { + protected void setBlockAndMetadata(World world, int x, int y, int z, Block blockID, int blockMeta) { Block block = world.getBlock(x, y, z); - if (block == null || block.canPlaceBlockAt(world, x, y, z)) - { - if (this.notify) - { + if (block == null || block.canPlaceBlockAt(world, x, y, z)) { + if (this.notify) { world.setBlock(x, y, z, blockID, blockMeta, 3); - } - else - { + } else { world.setBlock(x, y, z, blockID, blockMeta, 2); } } } -} \ No newline at end of file +} diff --git a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java index 9cd2a054b68..21cdc6312ca 100644 --- a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java @@ -8,24 +8,34 @@ import net.minecraft.world.gen.feature.WorldGenerator; import tconstruct.util.config.PHConstruct; -public class SurfaceOreGen extends WorldGenerator -{ +public class SurfaceOreGen extends WorldGenerator { /** The block of the ore to be placed using this generator. */ private Block minableBlock; + private int minableBlockMeta = 0; /** The number of blocks to generate. */ private int numberOfBlocks; + private Block[] replaceBlocks; private boolean alterSize; - public SurfaceOreGen(Block b, int meta, int number, boolean changeSize) - { - this(b, meta, number, changeSize, Blocks.stone, (Block) Blocks.grass, Blocks.dirt, Blocks.water, Blocks.sand, Blocks.gravel, Blocks.snow); + public SurfaceOreGen(Block b, int meta, int number, boolean changeSize) { + this( + b, + meta, + number, + changeSize, + Blocks.stone, + (Block) Blocks.grass, + Blocks.dirt, + Blocks.water, + Blocks.sand, + Blocks.gravel, + Blocks.snow); } - public SurfaceOreGen(Block b, int meta, int number, boolean changeSize, Block... target) - { + public SurfaceOreGen(Block b, int meta, int number, boolean changeSize, Block... target) { this.minableBlock = b; this.numberOfBlocks = number; this.replaceBlocks = target; @@ -33,26 +43,20 @@ public SurfaceOreGen(Block b, int meta, int number, boolean changeSize, Block... minableBlockMeta = meta; } - int findGround (World world, int x, int y, int z) - { + int findGround(World world, int x, int y, int z) { int returnHeight = -1; Block block = world.getBlock(x, y - 1, z); - if (!world.getBlock(x, y, z).isOpaqueCube() && (block == Blocks.dirt || block == Blocks.grass)) - { + if (!world.getBlock(x, y, z).isOpaqueCube() && (block == Blocks.dirt || block == Blocks.grass)) { return y; } int height = PHConstruct.seaLevel + 64; - do - { - if (height < PHConstruct.seaLevel - 30) - { + do { + if (height < PHConstruct.seaLevel - 30) { break; } Block b = world.getBlock(x, height, z); - if (b == Blocks.dirt || b == Blocks.grass) - { - if (!world.getBlock(x, height + 1, z).isOpaqueCube()) - { + if (b == Blocks.dirt || b == Blocks.grass) { + if (!world.getBlock(x, height + 1, z).isOpaqueCube()) { returnHeight = height + 1; } break; @@ -63,19 +67,15 @@ int findGround (World world, int x, int y, int z) } @Override - public boolean generate (World world, Random random, int startX, int startY, int startZ) - { - if (alterSize) - { + public boolean generate(World world, Random random, int startX, int startY, int startZ) { + if (alterSize) { startY = findGround(world, startX, startY, startZ); - if (startY == -1) - return false; + if (startY == -1) return false; } float f = random.nextFloat() * (float) Math.PI; int blockNumber = numberOfBlocks; - if (alterSize) - blockNumber = numberOfBlocks * 2 / 5 + random.nextInt(numberOfBlocks * 3 / 5); + if (alterSize) blockNumber = numberOfBlocks * 2 / 5 + random.nextInt(numberOfBlocks * 3 / 5); double d0 = (double) ((float) (startX + 8) + MathHelper.sin(f) * (float) blockNumber / 8.0F); double d1 = (double) ((float) (startX + 8) - MathHelper.sin(f) * (float) blockNumber / 8.0F); double d2 = (double) ((float) (startZ + 8) + MathHelper.cos(f) * (float) blockNumber / 8.0F); @@ -83,14 +83,15 @@ public boolean generate (World world, Random random, int startX, int startY, int double d4 = (double) (startY + random.nextInt(3) - 2); double d5 = (double) (startY + random.nextInt(3) - 2); - for (int l = 0; l <= blockNumber; ++l) - { + for (int l = 0; l <= blockNumber; ++l) { double d6 = d0 + (d1 - d0) * (double) l / (double) blockNumber; double d7 = d4 + (d5 - d4) * (double) l / (double) blockNumber; double d8 = d2 + (d3 - d2) * (double) l / (double) blockNumber; double d9 = random.nextDouble() * (double) blockNumber / 16.0D; - double d10 = (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + 1.0D; - double d11 = (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + 1.0D; + double d10 = + (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + 1.0D; + double d11 = + (double) (MathHelper.sin((float) l * (float) Math.PI / (float) blockNumber) + 1.0F) * d9 + 1.0D; int i1 = MathHelper.floor_double(d6 - d10 / 2.0D); int j1 = MathHelper.floor_double(d7 - d11 / 2.0D); int k1 = MathHelper.floor_double(d8 - d10 / 2.0D); @@ -98,33 +99,26 @@ public boolean generate (World world, Random random, int startX, int startY, int int i2 = MathHelper.floor_double(d7 + d11 / 2.0D); int j2 = MathHelper.floor_double(d8 + d10 / 2.0D); - for (int k2 = i1; k2 <= l1; ++k2) - { + for (int k2 = i1; k2 <= l1; ++k2) { double d12 = ((double) k2 + 0.5D - d6) / (d10 / 2.0D); - if (d12 * d12 < 1.0D) - { - for (int l2 = j1; l2 <= i2; ++l2) - { + if (d12 * d12 < 1.0D) { + for (int l2 = j1; l2 <= i2; ++l2) { double d13 = ((double) l2 + 0.5D - d7) / (d11 / 2.0D); - if (d12 * d12 + d13 * d13 < 1.0D) - { - for (int i3 = k1; i3 <= j2; ++i3) - { + if (d12 * d12 + d13 * d13 < 1.0D) { + for (int i3 = k1; i3 <= j2; ++i3) { double d14 = ((double) i3 + 0.5D - d8) / (d10 / 2.0D); Block block = world.getBlock(k2, l2, i3); - if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D) - { - if (block == null || !world.getBlock(k2, l2, i3).isOpaqueCube()) + if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D) { + if (block == null + || !world.getBlock(k2, l2, i3).isOpaqueCube()) world.setBlock(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); - else - { - for (int iter = 0; iter < replaceBlocks.length; iter++) - { - if (world.getBlock(k2, l2, i3).isReplaceableOreGen(world, k2, l2, i3, replaceBlocks[iter])) - { + else { + for (int iter = 0; iter < replaceBlocks.length; iter++) { + if (world.getBlock(k2, l2, i3) + .isReplaceableOreGen(world, k2, l2, i3, replaceBlocks[iter])) { world.setBlock(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); break; } diff --git a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java index dbbe174554d..4d55ca3d695 100644 --- a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java @@ -11,10 +11,8 @@ import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -public class TBaseWorldGenerator implements IWorldGenerator -{ - public TBaseWorldGenerator() - { +public class TBaseWorldGenerator implements IWorldGenerator { + public TBaseWorldGenerator() { copper = new WorldGenMinable(TinkerWorld.oreSlag, 3, 8, Blocks.stone); tin = new WorldGenMinable(TinkerWorld.oreSlag, 4, 8, Blocks.stone); aluminum = new WorldGenMinable(TinkerWorld.oreSlag, 5, 6, Blocks.stone); @@ -31,90 +29,77 @@ public TBaseWorldGenerator() } @Override - public void generate (Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) - { - if (world.provider.isHellWorld) - { + public void generate( + Random random, + int chunkX, + int chunkZ, + World world, + IChunkProvider chunkGenerator, + IChunkProvider chunkProvider) { + if (world.provider.isHellWorld) { generateNether(random, chunkX * 16, chunkZ * 16, world); - } - else if (world.provider.terrainType != WorldType.FLAT || PHConstruct.genOresFlat) - { + } else if (world.provider.terrainType != WorldType.FLAT || PHConstruct.genOresFlat) { generateSurface(random, chunkX * 16, chunkZ * 16, world); - if (world.provider.dimensionId == 0) - generateOreBushes(random, chunkX * 16, chunkZ * 16, world); + if (world.provider.dimensionId == 0) generateOreBushes(random, chunkX * 16, chunkZ * 16, world); } - if (PHConstruct.superfunWorld && world.provider.dimensionId == 0) - { + if (PHConstruct.superfunWorld && world.provider.dimensionId == 0) { superfunGenerate(random, chunkX * 16, chunkZ * 16, world); } - if (PHConstruct.worldBorder) - { + if (PHConstruct.worldBorder) { generateChunkBorder(random, chunkX * 16, chunkZ * 16, world); } } - void generateSurface (Random random, int xChunk, int zChunk, World world) - { + void generateSurface(Random random, int xChunk, int zChunk, World world) { String biomeName = world.getWorldChunkManager().getBiomeGenAt(xChunk, zChunk).biomeName; generateUndergroundOres(random, xChunk, zChunk, world); - if (biomeName == "Extreme Hills Edge" || biomeName == "Extreme Hills") - { + if (biomeName == "Extreme Hills Edge" || biomeName == "Extreme Hills") { generateUndergroundOres(random, xChunk, zChunk, world); } } - void generateUndergroundOres (Random random, int xChunk, int zChunk, World world) - { + void generateUndergroundOres(Random random, int xChunk, int zChunk, World world) { int xPos, yPos, zPos; - if (PHConstruct.generateCopper) - { - for (int q = 0; q <= PHConstruct.copperuDensity; q++) - { + if (PHConstruct.generateCopper) { + for (int q = 0; q <= PHConstruct.copperuDensity; q++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.copperuMinY + random.nextInt(PHConstruct.copperuMaxY - PHConstruct.copperuMinY); zPos = zChunk + random.nextInt(16); copper.generate(world, random, xPos, yPos, zPos); } } - if (PHConstruct.generateTin) - { - for (int q = 0; q <= PHConstruct.tinuDensity; q++) - { + if (PHConstruct.generateTin) { + for (int q = 0; q <= PHConstruct.tinuDensity; q++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.tinuMinY + random.nextInt(PHConstruct.tinuMaxY - PHConstruct.tinuMinY); zPos = zChunk + random.nextInt(16); tin.generate(world, random, xPos, yPos, zPos); } } - if (PHConstruct.generateAluminum) - { - for (int q = 0; q <= PHConstruct.aluminumuDensity; q++) - { + if (PHConstruct.generateAluminum) { + for (int q = 0; q <= PHConstruct.aluminumuDensity; q++) { xPos = xChunk + random.nextInt(16); - yPos = PHConstruct.aluminumuMinY + random.nextInt(PHConstruct.aluminumuMaxY - PHConstruct.aluminumuMinY); + yPos = PHConstruct.aluminumuMinY + + random.nextInt(PHConstruct.aluminumuMaxY - PHConstruct.aluminumuMinY); zPos = zChunk + random.nextInt(16); aluminum.generate(world, random, xPos, yPos, zPos); } } } - void generateOreBushes (Random random, int xChunk, int zChunk, World world) - { + void generateOreBushes(Random random, int xChunk, int zChunk, World world) { int xPos, yPos, zPos; - if (PHConstruct.generateIronBush && random.nextInt(PHConstruct.ironBushRarity + 1) == 0) - { - for (int i = 0; i < PHConstruct.ironBushDensity; i++) - { + if (PHConstruct.generateIronBush && random.nextInt(PHConstruct.ironBushRarity + 1) == 0) { + for (int i = 0; i < PHConstruct.ironBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.seaLevel - 32; zPos = zChunk + random.nextInt(16); yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.seaLevel, 0); - if (yPos != -1) - { + if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); * TConstruct.logger.info("Iron: "+coord.toString()); @@ -123,16 +108,13 @@ void generateOreBushes (Random random, int xChunk, int zChunk, World world) } } } - if (PHConstruct.generateGoldBush && random.nextInt(PHConstruct.goldBushRarity + 1) == 0) - { - for (int i = 0; i < PHConstruct.goldBushDensity; i++) - { + if (PHConstruct.generateGoldBush && random.nextInt(PHConstruct.goldBushRarity + 1) == 0) { + for (int i = 0; i < PHConstruct.goldBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = 16; zPos = zChunk + random.nextInt(16); yPos = findAdequateLocation(world, xPos, yPos, zPos, 32, 0); - if (yPos != -1) - { + if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); * TConstruct.logger.info("Gold: "+coord.toString()); @@ -141,19 +123,18 @@ void generateOreBushes (Random random, int xChunk, int zChunk, World world) } } } - if (PHConstruct.generateCopperBush && random.nextInt(PHConstruct.copperBushRarity + 1) == 0)// && - // random.nextInt(PHConstruct.copperbRarity) - // == - // 0) + if (PHConstruct.generateCopperBush && random.nextInt(PHConstruct.copperBushRarity + 1) == 0) // && + // random.nextInt(PHConstruct.copperbRarity) + // == + // 0) { - for (int i = 0; i < PHConstruct.copperBushDensity; i++) - { + for (int i = 0; i < PHConstruct.copperBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = (PHConstruct.copperBushMaxY + PHConstruct.copperBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.copperBushMaxY, PHConstruct.copperBushMinY); - if (yPos != -1) - { + yPos = findAdequateLocation( + world, xPos, yPos, zPos, PHConstruct.copperBushMaxY, PHConstruct.copperBushMinY); + if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); * TConstruct.logger.info("Copper: "+coord.toString()); @@ -162,18 +143,16 @@ void generateOreBushes (Random random, int xChunk, int zChunk, World world) } } } - if (PHConstruct.generateTinBush && random.nextInt(PHConstruct.tinBushRarity + 1) == 0)// && - // random.nextInt(PHConstruct.tinbRarity) - // == 0) + if (PHConstruct.generateTinBush && random.nextInt(PHConstruct.tinBushRarity + 1) == 0) // && + // random.nextInt(PHConstruct.tinbRarity) + // == 0) { - for (int i = 0; i < PHConstruct.tinBushDensity; i++) - { + for (int i = 0; i < PHConstruct.tinBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = (PHConstruct.tinBushMaxY + PHConstruct.tinBushMinY) / 2; zPos = zChunk + random.nextInt(16); yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.tinBushMaxY, PHConstruct.tinBushMinY); - if (yPos != -1) - { + if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); * TConstruct.logger.info("Tin: "+coord.toString()); @@ -182,19 +161,18 @@ void generateOreBushes (Random random, int xChunk, int zChunk, World world) } } } - if (PHConstruct.generateAluminumBush && random.nextInt(PHConstruct.aluminumBushRarity + 1) == 0)// && - // random.nextInt(PHConstruct.aluminumbRarity) - // == - // 0) + if (PHConstruct.generateAluminumBush && random.nextInt(PHConstruct.aluminumBushRarity + 1) == 0) // && + // random.nextInt(PHConstruct.aluminumbRarity) + // == + // 0) { - for (int i = 0; i < PHConstruct.aluminumBushDensity; i++) - { + for (int i = 0; i < PHConstruct.aluminumBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = (PHConstruct.aluminumBushMaxY + PHConstruct.aluminumBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.aluminumBushMaxY, PHConstruct.aluminumBushMinY); - if (yPos != -1) - { + yPos = findAdequateLocation( + world, xPos, yPos, zPos, PHConstruct.aluminumBushMaxY, PHConstruct.aluminumBushMinY); + if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); * TConstruct.logger.info("Aluminum: "+coord.toString()); @@ -203,16 +181,13 @@ void generateOreBushes (Random random, int xChunk, int zChunk, World world) } } } - if (PHConstruct.generateEssenceBush && random.nextInt(PHConstruct.essenceBushRarity) == 0) - { - for (int i = 0; i < PHConstruct.silverBushDensity; i++) - { + if (PHConstruct.generateEssenceBush && random.nextInt(PHConstruct.essenceBushRarity) == 0) { + for (int i = 0; i < PHConstruct.silverBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.seaLevel - 16; zPos = zChunk + random.nextInt(16); yPos = findAdequateLocation(world, xPos, yPos, zPos, 32, 0); - if (yPos != -1) - { + if (yPos != -1) { /* * CoordTuple coord = new CoordTuple(xPos, yPos, zPos); * TConstruct.logger.info("Silver: "+coord.toString()); @@ -223,39 +198,30 @@ void generateOreBushes (Random random, int xChunk, int zChunk, World world) } } - void generateNether (Random random, int xChunk, int zChunk, World world) - { + void generateNether(Random random, int xChunk, int zChunk, World world) { int xPos, yPos, zPos; - if (PHConstruct.generateCobalt) - { - for (int i = 0; i < PHConstruct.cobaltDensity; i++) - { + if (PHConstruct.generateCobalt) { + for (int i = 0; i < PHConstruct.cobaltDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = random.nextInt(64) + 32; zPos = zChunk + random.nextInt(16); cobalt.generate(world, random, xPos, yPos, zPos); - } - for (int i = 0; i < PHConstruct.cobaltDensity; i++) - { + for (int i = 0; i < PHConstruct.cobaltDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = random.nextInt(128); zPos = zChunk + random.nextInt(16); cobalt.generate(world, random, xPos, yPos, zPos); } } - if (PHConstruct.generateArdite) - { - for (int i = 0; i < PHConstruct.arditeDensity; i++) - { + if (PHConstruct.generateArdite) { + for (int i = 0; i < PHConstruct.arditeDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = random.nextInt(64) + 32; zPos = zChunk + random.nextInt(16); ardite.generate(world, random, xPos, yPos, zPos); - } - for (int i = 0; i < PHConstruct.arditeDensity; i++) - { + for (int i = 0; i < PHConstruct.arditeDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = random.nextInt(128); zPos = zChunk + random.nextInt(16); @@ -264,19 +230,16 @@ void generateNether (Random random, int xChunk, int zChunk, World world) } } - int findAdequateLocation (World world, int x, int y, int z, int heightLimit, int depthLimit) - { + int findAdequateLocation(World world, int x, int y, int z, int heightLimit, int depthLimit) { int height = y; - do - { + do { if (world.getBlock(x, height, z) == Blocks.air && world.getBlock(x, height + 1, z) != Blocks.air) return height + 1; height++; } while (height < heightLimit); height = y; - do - { + do { if (world.getBlock(x, height, z) == Blocks.air && world.getBlock(x, height - 1, z) != Blocks.air) return height - 1; height--; @@ -285,28 +248,22 @@ int findAdequateLocation (World world, int x, int y, int z, int heightLimit, int return -1; } - void superfunGenerate (Random random, int chunkX, int chunkZ, World world) - { + void superfunGenerate(Random random, int chunkX, int chunkZ, World world) { /* * for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) * world.setBlock(x+chunkX, 192, z+chunkZ, Block.glowStone); */ - for (int x = 0; x < 16; x++) - { - for (int z = 0; z < 16; z++) - { - for (int y = 0; y < 128; y++) - { + for (int x = 0; x < 16; x++) { + for (int z = 0; z < 16; z++) { + for (int y = 0; y < 128; y++) { Block block = world.getBlock(x + chunkX, y, z + chunkZ); - if (block != null) - { + if (block != null) { if (block.getMaterial() == Material.leaves) world.setBlock(x + chunkX, y, z + chunkZ, Blocks.lava, 0, 0); if (block.getMaterial() == Material.wood) world.setBlock(x + chunkX, y, z + chunkZ, Blocks.netherrack, 0, 0); - if (block == Blocks.stone) - world.setBlock(x + chunkX, y, z + chunkZ, Blocks.end_stone, 0, 0); + if (block == Blocks.stone) world.setBlock(x + chunkX, y, z + chunkZ, Blocks.end_stone, 0, 0); if (y > 40 && (block.getMaterial() == Material.ground || block.getMaterial() == Material.grass)) world.setBlock(x + chunkX, y, z + chunkZ, Blocks.soul_sand, 0, 0); if (block.getMaterial() == Material.sand) @@ -317,16 +274,14 @@ void superfunGenerate (Random random, int chunkX, int chunkZ, World world) } } - void generateChunkBorder (Random random, int chunkX, int chunkZ, World world) - { - for (int x = 0; x < 16; x++) - { - for (int z = 0; z < 16; z++) - { - if (x + chunkX == PHConstruct.worldBorderSize || x + chunkX == -PHConstruct.worldBorderSize || z + chunkZ == PHConstruct.worldBorderSize || z + chunkZ == -PHConstruct.worldBorderSize) - { - for (int y = 0; y < 256; y++) - { + void generateChunkBorder(Random random, int chunkX, int chunkZ, World world) { + for (int x = 0; x < 16; x++) { + for (int z = 0; z < 16; z++) { + if (x + chunkX == PHConstruct.worldBorderSize + || x + chunkX == -PHConstruct.worldBorderSize + || z + chunkZ == PHConstruct.worldBorderSize + || z + chunkZ == -PHConstruct.worldBorderSize) { + for (int y = 0; y < 256; y++) { world.setBlock(x + chunkX, y, z + chunkZ, Blocks.bedrock, 0, 0); } } diff --git a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index 68f6ad50f54..529b908dd0f 100644 --- a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -1,5 +1,8 @@ package tconstruct.world.gen; +import static net.minecraft.world.biome.BiomeGenBase.*; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; + import com.google.common.collect.*; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.Random; @@ -9,11 +12,7 @@ import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -import static net.minecraft.world.biome.BiomeGenBase.*; -import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; - -public class TerrainGenEventHandler -{ +public class TerrainGenEventHandler { private final SurfaceOreGen ironSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 0, 12, true); private final SurfaceOreGen goldSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 1, 20, true); private final SurfaceOreGen copperSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 2, 12, true); @@ -21,67 +20,57 @@ public class TerrainGenEventHandler private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 4, 12, true); private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 5, 30, true); - private static ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge); + private static ImmutableCollection EXTRA_ORE_BIOMES = + ImmutableList.of(extremeHills, extremeHillsEdge); @SubscribeEvent - public void onDecorateEvent (Decorate e) - { + public void onDecorateEvent(Decorate e) { // Trigger just before sand pass one--which comes just after vanilla ore // generation. - if (e.type != SAND) - return; + if (e.type != SAND) return; BiomeGenBase biome = e.world.getWorldChunkManager().getBiomeGenAt(e.chunkX, e.chunkZ); int iterations = EXTRA_ORE_BIOMES.contains(biome) ? 2 : 1; - for (int i = 0; i < iterations; i++) - { + for (int i = 0; i < iterations; i++) { generateSurfaceOres(e.rand, e.chunkX, e.chunkZ, e.world); } } - private void generateSurfaceOres (Random random, int xChunk, int zChunk, World world) - { - if(random == null) - return; + private void generateSurfaceOres(Random random, int xChunk, int zChunk, World world) { + if (random == null) return; int xPos, yPos, zPos; - if (PHConstruct.generateIronSurface && random.nextInt(PHConstruct.ironsRarity) == 0) - { + if (PHConstruct.generateIronSurface && random.nextInt(PHConstruct.ironsRarity) == 0) { xPos = xChunk + random.nextInt(16); yPos = 64 + PHConstruct.seaLevel; zPos = zChunk + random.nextInt(16); ironSurface.generate(world, random, xPos, yPos, zPos); } - if (PHConstruct.generateGoldSurface && random.nextInt(PHConstruct.goldsRarity) == 0) - { + if (PHConstruct.generateGoldSurface && random.nextInt(PHConstruct.goldsRarity) == 0) { xPos = xChunk + random.nextInt(16); yPos = 64 + PHConstruct.seaLevel; zPos = zChunk + random.nextInt(16); goldSurface.generate(world, random, xPos, yPos, zPos); } - if (PHConstruct.generateCopperSurface && random.nextInt(PHConstruct.coppersRarity) == 0) - { + if (PHConstruct.generateCopperSurface && random.nextInt(PHConstruct.coppersRarity) == 0) { xPos = xChunk + random.nextInt(16); yPos = 64 + PHConstruct.seaLevel; zPos = zChunk + random.nextInt(16); copperSurface.generate(world, random, xPos, yPos, zPos); } - if (PHConstruct.generateTinSurface && random.nextInt(PHConstruct.tinsRarity) == 0) - { + if (PHConstruct.generateTinSurface && random.nextInt(PHConstruct.tinsRarity) == 0) { xPos = xChunk + random.nextInt(16); yPos = 64 + PHConstruct.seaLevel; zPos = zChunk + random.nextInt(16); tinSurface.generate(world, random, xPos, yPos, zPos); } - if (PHConstruct.generateAluminumSurface && random.nextInt(PHConstruct.aluminumsRarity) == 0) - { + if (PHConstruct.generateAluminumSurface && random.nextInt(PHConstruct.aluminumsRarity) == 0) { xPos = xChunk + random.nextInt(16); yPos = 64 + PHConstruct.seaLevel; zPos = zChunk + random.nextInt(16); aluminumSurface.generate(world, random, xPos, yPos, zPos); } - if (PHConstruct.generateCobaltSurface && random.nextInt(PHConstruct.cobaltsRarity) == 0) - { + if (PHConstruct.generateCobaltSurface && random.nextInt(PHConstruct.cobaltsRarity) == 0) { xPos = xChunk + random.nextInt(16); yPos = 64 + PHConstruct.seaLevel; zPos = zChunk + random.nextInt(16); diff --git a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index b93619e2d1c..42ad05af281 100644 --- a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -9,95 +9,91 @@ import net.minecraft.util.*; import net.minecraft.world.World; -public class BarricadeItem extends ItemBlock -{ +public class BarricadeItem extends ItemBlock { private Block b; - public BarricadeItem(Block b) - { + public BarricadeItem(Block b) { super(b); this.b = b; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add(StatCollector.translateToLocal("barricade.tooltip")); } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { Block b = world.getBlock(x, y, z); - if (b == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) - { + if (b == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { side = 1; - } - else if (b != Blocks.vine && b != Blocks.tallgrass && b != Blocks.deadbush && (b == null || !b.canPlaceBlockAt(world, x, y, z))) - { - if (side == 0) - { + } else if (b != Blocks.vine + && b != Blocks.tallgrass + && b != Blocks.deadbush + && (b == null || !b.canPlaceBlockAt(world, x, y, z))) { + if (side == 0) { --y; } - if (side == 1) - { + if (side == 1) { ++y; } - if (side == 2) - { + if (side == 2) { --z; } - if (side == 3) - { + if (side == 3) { ++z; } - if (side == 4) - { + if (side == 4) { --x; } - if (side == 5) - { + if (side == 5) { ++x; } } - if (stack.stackSize == 0) - { + if (stack.stackSize == 0) { return false; - } - else if (!player.canPlayerEdit(x, y, z, side, stack)) - { + } else if (!player.canPlayerEdit(x, y, z, side, stack)) { return false; - } - else if (y == 255 && this.b.getMaterial().isSolid()) - { + } else if (y == 255 && this.b.getMaterial().isSolid()) { return false; - } - else if (world.canPlaceEntityOnSide(this.b, x, y, z, false, side, player, stack)) - { + } else if (world.canPlaceEntityOnSide(this.b, x, y, z, false, side, player, stack)) { Block block = this.b; // int meta = this.getMetadata(stack.getItemDamage()); int rotation = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int meta = rotation * 4; int metadata = this.b.onBlockPlaced(world, x, y, z, side, hitX, hitY, hitZ, meta); - if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) - { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); + if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { + world.playSoundEffect( + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + block.stepSound.soundName, + (block.stepSound.getVolume() + 1.0F) / 2.0F, + block.stepSound.getPitch() * 0.8F); --stack.stackSize; } return true; - } - else - { + } else { return false; } } diff --git a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java index 64673952815..960a39652e1 100644 --- a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java @@ -8,42 +8,41 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; -public class CraftedSoilItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt", "Grout" }; +public class CraftedSoilItemBlock extends MultiItemBlock { + public static final String blockTypes[] = { + "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt", "Grout" + }; - public CraftedSoilItemBlock(Block b) - { + public CraftedSoilItemBlock(Block b) { super(b, "CraftedSoil", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public String getUnlocalizedName (ItemStack itemstack) - { + public String getUnlocalizedName(ItemStack itemstack) { int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockTypes.length - 1); - if (pos <= 4) - return super.getUnlocalizedName(itemstack); - return (new StringBuilder()).append("block.slime.soil.").append(this.blockTypes[pos]).toString(); + if (pos <= 4) return super.getUnlocalizedName(itemstack); + return (new StringBuilder()) + .append("block.slime.soil.") + .append(this.blockTypes[pos]) + .toString(); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 1: - if(StatCollector.canTranslate("grout.tooltip")) - list.add(StatCollector.translateToLocal("grout.tooltip")); - break; - case 3: - list.add(StatCollector.translateToLocal("craftedsoil1.tooltip")); - break; - case 4: - list.add(StatCollector.translateToLocal("craftedsoil2.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 1: + if (StatCollector.canTranslate("grout.tooltip")) + list.add(StatCollector.translateToLocal("grout.tooltip")); + break; + case 3: + list.add(StatCollector.translateToLocal("craftedsoil1.tooltip")); + break; + case 4: + list.add(StatCollector.translateToLocal("craftedsoil2.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java index e8256f6195c..f6acd04f69e 100644 --- a/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java +++ b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class GravelOreItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; +public class GravelOreItem extends MultiItemBlock { + public static final String blockTypes[] = {"iron", "gold", "copper", "tin", "aluminum", "cobalt"}; - public GravelOreItem(Block b) - { + public GravelOreItem(Block b) { super(b, "block.ore.gravel", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java index 6e2ef0c7573..6cddeb7bb44 100644 --- a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java @@ -10,19 +10,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -public class HamboneItemBlock extends ItemBlock -{ - public HamboneItemBlock(Block b) - { +public class HamboneItemBlock extends ItemBlock { + public HamboneItemBlock(Block b) { super(b); itemUseDuration = 32; - if (Loader.isModLoaded("HungerOverhaul")) - { + if (Loader.isModLoaded("HungerOverhaul")) { healAmount = 8; saturationModifier = 0.8f; - } - else - { + } else { healAmount = 20; saturationModifier = 3.0f; } @@ -31,8 +26,7 @@ public HamboneItemBlock(Block b) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add("\u00A74" + StatCollector.translateToLocal("hambone1.tooltip")); list.add(StatCollector.translateToLocal("hambone2.tooltip")); } @@ -42,6 +36,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo /** The amount this food item heals the player. */ private final int healAmount; + private final float saturationModifier; /** Whether wolves like this food (true for raw and cooked porkchop). */ @@ -73,14 +68,13 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo * super(par1); this.itemUseDuration = 32; this.healAmount = par2; * this.isWolfsFavoriteMeat = par4; this.saturationModifier = par3; * this.setCreativeTab(CreativeTabs.tabFood); } - * + * * public ItemFood(int par1, int par2, boolean par3) { this(par1, par2, * 0.6F, par3); } */ @Override - public ItemStack onEaten (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { + public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { --par1ItemStack.stackSize; par3EntityPlayer.getFoodStats().addStats(getHealAmount(), getSaturationModifier()); par2World.playSoundAtEntity(par3EntityPlayer, "random.burp", 0.5F, par2World.rand.nextFloat() * 0.1F + 0.9F); @@ -88,11 +82,10 @@ public ItemStack onEaten (ItemStack par1ItemStack, World par2World, EntityPlayer return par1ItemStack; } - protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (!par2World.isRemote && this.potionId > 0 && par2World.rand.nextFloat() < this.potionEffectProbability) - { - par3EntityPlayer.addPotionEffect(new PotionEffect(this.potionId, this.potionDuration * 20, this.potionAmplifier)); + protected void onFoodEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + if (!par2World.isRemote && this.potionId > 0 && par2World.rand.nextFloat() < this.potionEffectProbability) { + par3EntityPlayer.addPotionEffect( + new PotionEffect(this.potionId, this.potionDuration * 20, this.potionAmplifier)); } } @@ -100,8 +93,7 @@ protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlay * How long it takes to use or consume an item */ @Override - public int getMaxItemUseDuration (ItemStack par1ItemStack) - { + public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 32; } @@ -110,8 +102,7 @@ public int getMaxItemUseDuration (ItemStack par1ItemStack) * is being used */ @Override - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { + public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.eat; } @@ -120,34 +111,29 @@ public EnumAction getItemUseAction (ItemStack par1ItemStack) * pressed. Args: itemStack, world, entityPlayer */ @Override - public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (par3EntityPlayer.canEat(this.alwaysEdible)) - { + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + if (par3EntityPlayer.canEat(this.alwaysEdible)) { par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); } return par1ItemStack; } - public int getHealAmount () - { + public int getHealAmount() { return this.healAmount; } /** * gets the saturationModifier of the ItemFood */ - public float getSaturationModifier () - { + public float getSaturationModifier() { return this.saturationModifier; } /** * Whether wolves like this food (true for raw and cooked porkchop). */ - public boolean isWolfsFavoriteMeat () - { + public boolean isWolfsFavoriteMeat() { return this.isWolfsFavoriteMeat; } } diff --git a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java index 7313ddf44a4..a97fff0e60e 100644 --- a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java @@ -7,25 +7,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class MetalOreItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" }; +public class MetalOreItemBlock extends MultiItemBlock { + public static final String blockTypes[] = {"NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag"}; - public MetalOreItemBlock(Block b) - { + public MetalOreItemBlock(Block b) { super(b, "MetalOre", blockTypes); setMaxDamage(0); setHasSubtypes(true); } @Override - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.hasTagCompound()) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + if (stack.hasTagCompound()) { NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Liquid"); - if (liquidTag != null) - { + if (liquidTag != null) { list.add("Contains " + liquidTag.getString("LiquidName")); list.add(liquidTag.getInteger("Amount") + " mB"); } diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index 882ba49adfe..6478e7cd5a8 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -13,69 +13,68 @@ import net.minecraftforge.common.util.ForgeDirection; import tconstruct.world.TinkerWorld; -public class OreberryBushItem extends MultiItemBlock -{ +public class OreberryBushItem extends MultiItemBlock { public Block blockB; - public static final String blockTypes[] = { "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin" }; + public static final String blockTypes[] = { + "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", + "gold", "copper", "tin" + }; - public OreberryBushItem(Block b) - { + public OreberryBushItem(Block b) { super(b, "block.oreberry", blockTypes); blockB = b; setHasSubtypes(true); } @Override - public int getMetadata (int meta) - { + public int getMetadata(int meta) { return meta % 4; } /* Place bushes on dirt, grass, or other bushes only */ @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) - { - if (side != 1) - return false; - - else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + if (side != 1) return false; + else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = world.getBlock(x, y, z); - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) - { + if (block != null + && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerry) + && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); - if (!player.capabilities.isCreativeMode) - stack.stackSize--; - if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); + if (!player.capabilities.isCreativeMode) stack.stackSize--; + if (!world.isRemote) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); return true; - } - else - return false; - } - else - return false; + } else return false; + } else return false; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage() % 4) - { - case 0: - list.add(StatCollector.translateToLocal("oreberrybush1.tooltip")); - break; - case 1: - list.add(StatCollector.translateToLocal("oreberrybush2.tooltip")); - break; - case 2: - list.add(StatCollector.translateToLocal("oreberrybush3.tooltip")); - break; - case 3: - list.add(StatCollector.translateToLocal("oreberrybush4.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage() % 4) { + case 0: + list.add(StatCollector.translateToLocal("oreberrybush1.tooltip")); + break; + case 1: + list.add(StatCollector.translateToLocal("oreberrybush2.tooltip")); + break; + case 2: + list.add(StatCollector.translateToLocal("oreberrybush3.tooltip")); + break; + case 3: + list.add(StatCollector.translateToLocal("oreberrybush4.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index 30c3707b132..86b9ca0cafd 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -13,67 +13,79 @@ import net.minecraftforge.common.util.ForgeDirection; import tconstruct.world.TinkerWorld; -public class OreberryBushSecondItem extends MultiItemBlock -{ +public class OreberryBushSecondItem extends MultiItemBlock { public Block blockB; - public static final String blockTypes[] = { "aluminum", "essence", "", "", "aluminum", "essence", "", "", "aluminum", "essence", "", "", "aluminum", "essence", "", "" }; + public static final String blockTypes[] = { + "aluminum", + "essence", + "", + "", + "aluminum", + "essence", + "", + "", + "aluminum", + "essence", + "", + "", + "aluminum", + "essence", + "", + "" + }; - public OreberryBushSecondItem(Block b) - { + public OreberryBushSecondItem(Block b) { super(b, "block.oreberry", blockTypes); blockB = b; setHasSubtypes(true); } @Override - public int getMetadata (int meta) - { + public int getMetadata(int meta) { return meta % 4; } /* Place bushes on dirt, grass, or other bushes only */ @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { - if (side != 1) - return false; + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + if (side != 1) return false; int meta = stack.getItemDamage(); - if (meta % 4 != 1 && world.getFullBlockLightValue(x, y + 1, z) >= 13) - return false; - - else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) - { + if (meta % 4 != 1 && world.getFullBlockLightValue(x, y + 1, z) >= 13) return false; + else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = world.getBlock(x, y, z); - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) - { + if (block != null + && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerrySecond) + && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); - if (!player.capabilities.isCreativeMode) - stack.stackSize--; - if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); + if (!player.capabilities.isCreativeMode) stack.stackSize--; + if (!world.isRemote) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); return true; - } - else - return false; - } - else - return false; + } else return false; + } else return false; } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage() % 4) - { - case 0: - list.add(StatCollector.translateToLocal("oreberrybush5.tooltip")); - break; - case 1: - list.add(StatCollector.translateToLocal("oreberrybush6.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage() % 4) { + case 0: + list.add(StatCollector.translateToLocal("oreberrybush5.tooltip")); + break; + case 1: + list.add(StatCollector.translateToLocal("oreberrybush6.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java index bd7c66c8ebd..5951f7d977e 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class SlimeGelItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "blue", "green", "purple", "magma", "yellow", "red", "metal" }; +public class SlimeGelItemBlock extends MultiItemBlock { + public static final String blockTypes[] = {"blue", "green", "purple", "magma", "yellow", "red", "metal"}; - public SlimeGelItemBlock(Block b) - { + public SlimeGelItemBlock(Block b) { super(b, "block.slime.congealed", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java index 015cae81780..9c29d4a0fa7 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class SlimeGrassItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "blue", "dirt" }; +public class SlimeGrassItemBlock extends MultiItemBlock { + public static final String blockTypes[] = {"blue", "dirt"}; - public SlimeGrassItemBlock(Block b) - { + public SlimeGrassItemBlock(Block b) { super(b, "block.slime.grass", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java index 9d5d6737bce..32f7fea6817 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class SlimeLeavesItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "blue" }; +public class SlimeLeavesItemBlock extends MultiItemBlock { + public static final String blockTypes[] = {"blue"}; - public SlimeLeavesItemBlock(Block b) - { + public SlimeLeavesItemBlock(Block b) { super(b, "block.slime.leaves", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java index b0c2a57d3ff..e15f7f9b9d4 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java @@ -3,15 +3,12 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -public class SlimeSaplingItemBlock extends MultiItemBlock -{ - public static final String blockTypes[] = { "bluegreen" }; +public class SlimeSaplingItemBlock extends MultiItemBlock { + public static final String blockTypes[] = {"bluegreen"}; - public SlimeSaplingItemBlock(Block b) - { + public SlimeSaplingItemBlock(Block b) { super(b, "block.slime.sapling", blockTypes); setMaxDamage(0); setHasSubtypes(true); } - } diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java index 33ea64b3bc0..bbfbdd203bc 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java @@ -6,12 +6,10 @@ import net.minecraft.util.*; import tconstruct.world.TinkerWorld; -public class SlimeTallGrassItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "tallgrass", "tallgrass.fern" }; +public class SlimeTallGrassItem extends MultiItemBlock { + public static final String blockTypes[] = {"tallgrass", "tallgrass.fern"}; - public SlimeTallGrassItem(Block b) - { + public SlimeTallGrassItem(Block b) { super(b, "block.slime", blockTypes); setMaxDamage(0); setHasSubtypes(true); @@ -19,10 +17,8 @@ public SlimeTallGrassItem(Block b) @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) - { + public IIcon getIconFromDamage(int meta) { int arr = MathHelper.clamp_int(meta, 0, this.blockTypes.length); return TinkerWorld.slimeTallGrass.getIcon(0, arr); } - } diff --git a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java index b964376425b..ceb2fdba84b 100644 --- a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java @@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -public class SoilSlabItem extends MultiItemBlock -{ - public static final String blockTypes[] = { "grass", "dirt", "mycelium", "slime", "grout", "blueslime", "graveyardsoil", "consecratedsoil" }; +public class SoilSlabItem extends MultiItemBlock { + public static final String blockTypes[] = { + "grass", "dirt", "mycelium", "slime", "grout", "blueslime", "graveyardsoil", "consecratedsoil" + }; - public SoilSlabItem(Block b) - { + public SoilSlabItem(Block b) { super(b, "block.soil.slab", blockTypes); setMaxDamage(0); setHasSubtypes(true); @@ -21,16 +21,14 @@ public SoilSlabItem(Block b) @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 3: - list.add(StatCollector.translateToLocal("craftedsoil.slab1.tooltip")); - break; - case 4: - list.add(StatCollector.translateToLocal("craftedsoil.slab2.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 3: + list.add(StatCollector.translateToLocal("craftedsoil.slab1.tooltip")); + break; + case 4: + list.add(StatCollector.translateToLocal("craftedsoil.slab2.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index 7bb4de016c0..258f673d2c8 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -8,12 +8,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; -public class WoolSlab1Item extends MultiItemBlock -{ +public class WoolSlab1Item extends MultiItemBlock { Block block; - public WoolSlab1Item(Block b) - { + public WoolSlab1Item(Block b) { super(b, "", "slab", ItemDye.field_150923_a); this.setSpecialIndex(7, 15); this.block = b; @@ -22,25 +20,37 @@ public WoolSlab1Item(Block b) } @Override - public String getUnlocalizedName (ItemStack par1ItemStack) - { + public String getUnlocalizedName(ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 7); return super.getUnlocalizedName() + "." + ItemDye.field_150923_a[7 - i] + ".slab"; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { Block b = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; boolean flag = (b) != null; - if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage()) - { - if (world.setBlock(x, y, z, Blocks.wool, trueMeta, 3)) - { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); + if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage()) { + if (world.setBlock(x, y, z, Blocks.wool, trueMeta, 3)) { + world.playSoundEffect( + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + this.block.stepSound.soundName, + (this.block.stepSound.getVolume() + 1.0F) / 2.0F, + this.block.stepSound.getPitch() * 0.8F); --stack.stackSize; return true; } diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index 1b4ae0754db..2b2689069c1 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -8,12 +8,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; -public class WoolSlab2Item extends MultiItemBlock -{ +public class WoolSlab2Item extends MultiItemBlock { Block block; - public WoolSlab2Item(Block b) - { + public WoolSlab2Item(Block b) { super(b, "", "slab", ItemDye.field_150923_a); this.setSpecialIndex(0, 7); this.block = b; @@ -22,31 +20,42 @@ public WoolSlab2Item(Block b) } @Override - public int getMetadata (int meta) - { + public int getMetadata(int meta) { return meta; } @Override - public String getUnlocalizedName (ItemStack par1ItemStack) - { + public String getUnlocalizedName(ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 7, 15); return super.getUnlocalizedName() + "." + ItemDye.field_150923_a[15 - i] + ".slab"; } @Override - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { + public boolean onItemUse( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; boolean flag = (block) != null; - if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage()) - { - if (world.setBlock(x, y, z, Blocks.wool, trueMeta + 8, 3)) - { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); + if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage()) { + if (world.setBlock(x, y, z, Blocks.wool, trueMeta + 8, 3)) { + world.playSoundEffect( + (double) ((float) x + 0.5F), + (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), + this.block.stepSound.soundName, + (this.block.stepSound.getVolume() + 1.0F) / 2.0F, + this.block.stepSound.getPitch() * 0.8F); --stack.stackSize; return true; } diff --git a/src/main/java/tconstruct/world/items/GoldenHead.java b/src/main/java/tconstruct/world/items/GoldenHead.java index 3aa1451bf57..78b3de190b1 100644 --- a/src/main/java/tconstruct/world/items/GoldenHead.java +++ b/src/main/java/tconstruct/world/items/GoldenHead.java @@ -10,18 +10,15 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -public class GoldenHead extends ItemFood -{ - public GoldenHead(int par2, float par3, boolean par4) - { +public class GoldenHead extends ItemFood { + public GoldenHead(int par2, float par3, boolean par4) { super(par2, par3, par4); this.setHasSubtypes(true); } @Override @SideOnly(Side.CLIENT) - public boolean hasEffect (ItemStack par1ItemStack) - { + public boolean hasEffect(ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() > 0; } @@ -30,25 +27,19 @@ public boolean hasEffect (ItemStack par1ItemStack) /** * Return an item rarity from EnumRarity */ - public EnumRarity getRarity (ItemStack par1ItemStack) - { + public EnumRarity getRarity(ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() == 0 ? EnumRarity.rare : EnumRarity.epic; } @Override - protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (par1ItemStack.getItemDamage() > 0) - { - if (!par2World.isRemote) - { + protected void onFoodEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + if (par1ItemStack.getItemDamage() > 0) { + if (!par2World.isRemote) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.regeneration.id, 600, 3)); par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.resistance.id, 6000, 0)); par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 6000, 0)); } - } - else - { + } else { super.onFoodEaten(par1ItemStack, par2World, par3EntityPlayer); } } @@ -58,22 +49,19 @@ protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlay /** * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) */ - public void getSubItems (Item b, CreativeTabs par2CreativeTabs, List par3List) - { + public void getSubItems(Item b, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(b, 1, 0)); } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon("tinker:skull_char_gold"); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add("\u00a75\u00a7o" + StatCollector.translateToLocal("goldenhead1.tooltip")); list.add("\u00a75\u00a7o" + StatCollector.translateToLocal("goldenhead2.tooltip")); } diff --git a/src/main/java/tconstruct/world/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java index dd2a52e6d20..7d452d38905 100644 --- a/src/main/java/tconstruct/world/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -11,62 +11,55 @@ import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; -public class OreBerries extends CraftingItem -{ - static String[] names = new String[] { "iron", "gold", "copper", "tin", "aluminum", "essence" }; - static String[] tex = new String[] { "oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_essence" }; +public class OreBerries extends CraftingItem { + static String[] names = new String[] {"iron", "gold", "copper", "tin", "aluminum", "essence"}; + static String[] tex = new String[] { + "oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_essence" + }; - public OreBerries() - { + public OreBerries() { super(names, tex, "oreberries/", "tinker", TConstructRegistry.materialTab); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - switch (stack.getItemDamage()) - { - case 0: - list.add(StatCollector.translateToLocal("oreberries1.tooltip")); - break; - case 1: - list.add(StatCollector.translateToLocal("oreberries2.tooltip")); - break; - case 2: - list.add(StatCollector.translateToLocal("oreberries3.tooltip")); - break; - case 3: - list.add(StatCollector.translateToLocal("oreberries4.tooltip")); - break; - case 4: - list.add(StatCollector.translateToLocal("oreberries5.tooltip")); - break; - case 5: - list.add(StatCollector.translateToLocal("oreberries6.tooltip")); - break; + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + switch (stack.getItemDamage()) { + case 0: + list.add(StatCollector.translateToLocal("oreberries1.tooltip")); + break; + case 1: + list.add(StatCollector.translateToLocal("oreberries2.tooltip")); + break; + case 2: + list.add(StatCollector.translateToLocal("oreberries3.tooltip")); + break; + case 3: + list.add(StatCollector.translateToLocal("oreberries4.tooltip")); + break; + case 4: + list.add(StatCollector.translateToLocal("oreberries5.tooltip")); + break; + case 5: + list.add(StatCollector.translateToLocal("oreberries6.tooltip")); + break; } } @Override - public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) - { - if (stack.getItemDamage() == 5) - { - EntityXPOrb entity = new EntityXPOrb(world, player.posX, player.posY + 1, player.posZ, itemRand.nextInt(14) + 6); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 5) { + EntityXPOrb entity = + new EntityXPOrb(world, player.posX, player.posY + 1, player.posZ, itemRand.nextInt(14) + 6); spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player); - if (!player.capabilities.isCreativeMode) - stack.stackSize--; + if (!player.capabilities.isCreativeMode) stack.stackSize--; } return stack; } - public static void spawnEntity (double x, double y, double z, Entity entity, World world, EntityPlayer player) - { - if (!world.isRemote) - { + public static void spawnEntity(double x, double y, double z, Entity entity, World world, EntityPlayer player) { + if (!world.isRemote) { world.spawnEntityInWorld(entity); } } - } diff --git a/src/main/java/tconstruct/world/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java index 2fcafd95475..7f86e98a85a 100644 --- a/src/main/java/tconstruct/world/items/SpecialFood.java +++ b/src/main/java/tconstruct/world/items/SpecialFood.java @@ -7,16 +7,14 @@ import net.minecraft.item.*; import net.minecraft.util.*; -public class SpecialFood extends ItemFood -{ +public class SpecialFood extends ItemFood { protected int[] hunger; protected float[] saturation; protected String[] unlocalizedNames; protected String[] iconNames; protected IIcon[] icons; - public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, String[] iconNames) - { + public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, String[] iconNames) { super(0, 0, false); this.hunger = hunger; this.saturation = saturation; @@ -25,49 +23,40 @@ public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, Stri } @Override - public int func_150905_g (ItemStack stack) - { + public int func_150905_g(ItemStack stack) { return hunger[stack.getItemDamage()]; } @Override - public float func_150906_h (ItemStack stack) - { + public float func_150906_h(ItemStack stack) { return saturation[stack.getItemDamage()]; } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage (int meta) - { - if (meta >= icons.length) - return icons[0]; + public IIcon getIconFromDamage(int meta) { + if (meta >= icons.length) return icons[0]; return icons[meta]; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IIconRegister iconRegister) - { + public void registerIcons(IIconRegister iconRegister) { this.icons = new IIcon[iconNames.length]; - for (int i = 0; i < this.icons.length; ++i) - { + for (int i = 0; i < this.icons.length; ++i) { this.icons[i] = iconRegister.registerIcon("tinker:" + iconNames[i]); } } @Override - public String getUnlocalizedName (ItemStack stack) - { + public String getUnlocalizedName(ItemStack stack) { int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, unlocalizedNames.length); return getUnlocalizedName() + "." + unlocalizedNames[arr]; } @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 0; i < unlocalizedNames.length; i++) - list.add(new ItemStack(b, 1, i)); + public void getSubItems(Item b, CreativeTabs tab, List list) { + for (int i = 0; i < unlocalizedNames.length; i++) list.add(new ItemStack(b, 1, i)); } } diff --git a/src/main/java/tconstruct/world/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java index 8e9127b91eb..16f24bccb3d 100644 --- a/src/main/java/tconstruct/world/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -8,39 +8,37 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -public class StrangeFood extends SpecialFood -{ - public StrangeFood() - { - super(new int[] { 2, 2, 4 }, new float[] { 1f, 1f, 0.6f }, new String[] { "edibleslime", "edibleblood", "bacon" }, new String[] { "food/edibleslime", "food/edibleblood", "food/bacon" }); +public class StrangeFood extends SpecialFood { + public StrangeFood() { + super( + new int[] {2, 2, 4}, + new float[] {1f, 1f, 0.6f}, + new String[] {"edibleslime", "edibleblood", "bacon"}, + new String[] {"food/edibleslime", "food/edibleblood", "food/bacon"}); this.setHasSubtypes(true); } @Override - protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player) - { - if (stack.getItemDamage() == 1) - player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0)); + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 1) player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0)); } @Override @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { int type = stack.getItemDamage(); - switch (type) - { - case 0: - list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood1.tooltip")); - list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood2.tooltip")); - break; - case 1: - list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood3.tooltip")); - list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood4.tooltip")); - break; - case 2: - list.add("\u00a7c" + StatCollector.translateToLocal("strangefood7.tooltip")); - break; + switch (type) { + case 0: + list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood1.tooltip")); + list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood2.tooltip")); + break; + case 1: + list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood3.tooltip")); + list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood4.tooltip")); + break; + case 2: + list.add("\u00a7c" + StatCollector.translateToLocal("strangefood7.tooltip")); + break; } } } diff --git a/src/main/java/tconstruct/world/model/BarricadeRender.java b/src/main/java/tconstruct/world/model/BarricadeRender.java index b2ca186f332..3b3d9111457 100644 --- a/src/main/java/tconstruct/world/model/BarricadeRender.java +++ b/src/main/java/tconstruct/world/model/BarricadeRender.java @@ -6,119 +6,100 @@ import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -public class BarricadeRender implements ISimpleBlockRenderingHandler -{ +public class BarricadeRender implements ISimpleBlockRenderingHandler { public static int model; - public BarricadeRender() - { + public BarricadeRender() { model = RenderingRegistry.getNextAvailableRenderId(); } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block barricade, int modelId, RenderBlocks renderer) - { - if (modelId == model) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block barricade, int modelId, RenderBlocks renderer) { + if (modelId == model) { int meta = world.getBlockMetadata(x, y, z); int type = meta % 4; - if (meta / 4 == 0) - { + if (meta / 4 == 0) { // if (type >= 0) // TODO setRenderBounds renderer.setRenderBounds(0.125, 0.0, 0.5, 0.375, 1.0, 0.75); renderer.renderStandardBlock(barricade, x, y, z); - if (type >= 1) - { + if (type >= 1) { renderer.setRenderBounds(0.625, 0.0, 0.5, 0.875, 1.0, 0.75); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 2) - { + if (type >= 2) { renderer.setRenderBounds(0.0, 0.125, 0.25, 1.0, 0.375, 0.5); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 3) - { + if (type >= 3) { renderer.setRenderBounds(0.0, 0.625, 0.25, 1.0, 0.875, 0.5); renderer.renderStandardBlock(barricade, x, y, z); } } - if (meta / 4 == 1) - { + if (meta / 4 == 1) { // if (type >= 0) renderer.setRenderBounds(0.25, 0.0, 0.125, 0.5, 1.0, 0.375); renderer.renderStandardBlock(barricade, x, y, z); - if (type >= 1) - { + if (type >= 1) { renderer.setRenderBounds(0.25, 0.0, 0.625, 0.5, 1.0, 0.875); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 2) - { + if (type >= 2) { renderer.setRenderBounds(0.5, 0.125, 0.0, 0.75, 0.375, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 3) - { + if (type >= 3) { renderer.setRenderBounds(0.5, 0.625, 0.0, 0.75, 0.875, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } } - if (meta / 4 == 2) - { + if (meta / 4 == 2) { // if (type >= 0) renderer.setRenderBounds(0.125, 0.0, 0.25, 0.375, 1.0, 0.5); renderer.renderStandardBlock(barricade, x, y, z); - if (type >= 1) - { + if (type >= 1) { renderer.setRenderBounds(0.625, 0.0, 0.25, 0.875, 1.0, 0.5); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 2) - { + if (type >= 2) { renderer.setRenderBounds(0.0, 0.125, 0.5, 1.0, 0.375, 0.75); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 3) - { + if (type >= 3) { renderer.setRenderBounds(0.0, 0.625, 0.5, 1.0, 0.875, 0.75); renderer.renderStandardBlock(barricade, x, y, z); } } - if (meta / 4 == 3) - { + if (meta / 4 == 3) { // if (type >= 0) renderer.setRenderBounds(0.5, 0.0, 0.125, 0.75, 1.0, 0.375); renderer.renderStandardBlock(barricade, x, y, z); - if (type >= 1) - { + if (type >= 1) { renderer.setRenderBounds(0.5, 0.0, 0.625, 0.75, 1.0, 0.875); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 2) - { + if (type >= 2) { renderer.setRenderBounds(0.25, 0.125, 0.0, 0.5, 0.375, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } - if (type >= 3) - { + if (type >= 3) { renderer.setRenderBounds(0.25, 0.625, 0.0, 0.5, 0.875, 1.0); renderer.renderStandardBlock(barricade, x, y, z); } @@ -130,10 +111,8 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); @@ -142,15 +121,12 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render } @Override - public boolean shouldRender3DInInventory (int modelId) - { + public boolean shouldRender3DInInventory(int modelId) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } - } diff --git a/src/main/java/tconstruct/world/model/CrystalModelSmall.java b/src/main/java/tconstruct/world/model/CrystalModelSmall.java index 4d5eb55d6da..d188dcb844f 100644 --- a/src/main/java/tconstruct/world/model/CrystalModelSmall.java +++ b/src/main/java/tconstruct/world/model/CrystalModelSmall.java @@ -2,13 +2,12 @@ import net.minecraft.client.model.ModelBase; -public class CrystalModelSmall extends ModelBase -{ +public class CrystalModelSmall extends ModelBase { /* * ModelRenderer body; ModelRendererTurbo top; ModelRendererTurbo bottom; - * + * * public CrystalModelSmall() { textureWidth = 32; textureHeight = 32; - * + * * body = new ModelRenderer(this, 0, 8); body.addBox(-2F, 0F, -2F, 4, 6, 4); * body.setRotationPoint(0F, 0F, 0F); setRotation(body, 0, 0.7853982F, 0); * top = new ModelRendererTurbo(this, 0, 0, 32, 32); top.addCone(0, 0, 0, @@ -17,16 +16,16 @@ public class CrystalModelSmall extends ModelBase * new ModelRendererTurbo(this, 0, 18, 32, 32); top.addCone(0, 10, 0, 2.8F, * 4, 4, 0, ModelRendererTurbo.MR_TOP, 4, 8); bottom.setRotationPoint(0F, * 6F, 0F); //setRotation(bottom, 0F, 0F, 0F); } - * + * * public void render (Entity entity, float f, float f1, float f2, float f3, * float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); * setRotationAngles(f, f1, f2, f3, f4, f5, entity); body.render(f5); * top.render(f5); bottom.render(f5); } - * + * * private void setRotation (ModelRenderer model, float x, float y, float z) * { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; * } - * + * * public void setRotationAngles (float f, float f1, float f2, float f3, * float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, * f3, f4, f5, entity); } diff --git a/src/main/java/tconstruct/world/model/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java index 43b547ac939..811db980ce2 100644 --- a/src/main/java/tconstruct/world/model/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -8,27 +8,23 @@ import tconstruct.world.entity.Crystal; @SideOnly(Side.CLIENT) -public class CrystalRender extends RenderLiving -{ +public class CrystalRender extends RenderLiving { /** The creeper model. */ private ModelBase creeperModel = new CrystalModelSmall(); - public CrystalRender() - { + public CrystalRender() { super(new CrystalModelSmall(), 0.5F); } /** * A method used to render a creeper's powered form as a pass model. */ - protected int renderCreeperPassModel (Crystal par1EntityCreeper, int par2, float par3) - { + protected int renderCreeperPassModel(Crystal par1EntityCreeper, int par2, float par3) { return -1; } - protected int func_77061_b (Crystal par1EntityCreeper, int par2, float par3) - { + protected int func_77061_b(Crystal par1EntityCreeper, int par2, float par3) { return -1; } @@ -45,27 +41,23 @@ protected int func_77061_b (Crystal par1EntityCreeper, int par2, float par3) * Returns an ARGB int color back. Args: entityLiving, lightBrightness, * partialTickTime */ - protected int getColorMultiplier (EntityLiving par1EntityLiving, float par2, float par3) - { + protected int getColorMultiplier(EntityLiving par1EntityLiving, float par2, float par3) { return super.getColorMultiplier(par1EntityLiving, par2, par3); } /** * Queries whether should render the specified pass or not. */ - protected int shouldRenderPass (EntityLiving par1EntityLiving, int par2, float par3) - { + protected int shouldRenderPass(EntityLiving par1EntityLiving, int par2, float par3) { return this.renderCreeperPassModel((Crystal) par1EntityLiving, par2, par3); } - protected int inheritRenderPass (EntityLiving par1EntityLiving, int par2, float par3) - { + protected int inheritRenderPass(EntityLiving par1EntityLiving, int par2, float par3) { return this.func_77061_b((Crystal) par1EntityLiving, par2, par3); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return texture; } diff --git a/src/main/java/tconstruct/world/model/OreberryRender.java b/src/main/java/tconstruct/world/model/OreberryRender.java index e56fad7217a..2e32dff0ef5 100644 --- a/src/main/java/tconstruct/world/model/OreberryRender.java +++ b/src/main/java/tconstruct/world/model/OreberryRender.java @@ -6,29 +6,22 @@ import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -public class OreberryRender implements ISimpleBlockRenderingHandler -{ +public class OreberryRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if (modelId == model) - { + if (modelId == model) { int md = world.getBlockMetadata(x, y, z); - if (md < 4) - { + if (md < 4) { renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); renderer.renderStandardBlock(block, x, y, z); - } - else if (md < 8) - { + } else if (md < 8) { renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); renderer.renderStandardBlock(block, x, y, z); - } - else - { + } else { renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); renderer.renderStandardBlock(block, x, y, z); } @@ -38,24 +31,20 @@ else if (md < 8) } @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); ItemHelper.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } } diff --git a/src/main/java/tconstruct/world/model/PunjiRender.java b/src/main/java/tconstruct/world/model/PunjiRender.java index a45730914e4..30c2436f8c5 100644 --- a/src/main/java/tconstruct/world/model/PunjiRender.java +++ b/src/main/java/tconstruct/world/model/PunjiRender.java @@ -6,45 +6,37 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -public class PunjiRender implements ISimpleBlockRenderingHandler -{ +public class PunjiRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 1.0f, 0.5625); renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 0.375f, 0.5625); renderer.renderStandardBlock(block, x, y, z); - if (metadata >= 1) - { + if (metadata >= 1) { renderer.setRenderBounds(0.125, 0.0, 0.125, 0.25, 0.375f, 0.25); renderer.renderStandardBlock(block, x, y, z); } - if (metadata >= 2) - { + if (metadata >= 2) { renderer.setRenderBounds(0.75, 0.0, 0.75, 0.875, 0.375f, 0.875); renderer.renderStandardBlock(block, x, y, z); } - if (metadata >= 3) - { + if (metadata >= 3) { renderer.setRenderBounds(0.125, 0.0, 0.75, 0.25, 0.375f, 0.875); renderer.renderStandardBlock(block, x, y, z); } - if (metadata >= 4) - { + if (metadata >= 4) { renderer.setRenderBounds(0.75, 0.0, 0.125, 0.875, 0.375f, 0.25); renderer.renderStandardBlock(block, x, y, z); } @@ -68,19 +60,16 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } - public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta) - { + public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); diff --git a/src/main/java/tconstruct/world/model/RenderLandmine.java b/src/main/java/tconstruct/world/model/RenderLandmine.java index fdf6d50b43e..ace7c8ee171 100644 --- a/src/main/java/tconstruct/world/model/RenderLandmine.java +++ b/src/main/java/tconstruct/world/model/RenderLandmine.java @@ -9,18 +9,16 @@ import tconstruct.mechworks.landmine.Helper; /** - * + * * @author fuj1n - * + * */ -public class RenderLandmine implements ISimpleBlockRenderingHandler -{ +public class RenderLandmine implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { GL11.glPushMatrix(); GL11.glTranslatef(-0.5F, 0F, -0.5F); @@ -31,22 +29,19 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - if (modelId == getRenderId()) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + if (modelId == getRenderId()) { renderBasedOnSide(world, x, y, z, block, modelId, renderer); return true; - } - else - { + } else { return false; } } @SuppressWarnings("incomplete-switch") - public void renderBasedOnSide (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { + public void renderBasedOnSide( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { int l = world.getBlockMetadata(x, y, z); int i1 = l & 7; boolean flag = (l & 8) > 0; @@ -55,41 +50,37 @@ public void renderBasedOnSide (IBlockAccess world, int x, int y, int z, Block bl // TConstruct.logger.info(i1 + " for " + dir); - switch (dir) - { - case DOWN: - renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); - break; - case UP: - renderer.setRenderBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); - break; - case NORTH: - renderer.setRenderBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); - break; - case SOUTH: - renderer.setRenderBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); - break; - case EAST: - renderer.setRenderBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; - case WEST: - renderer.setRenderBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); - break; + switch (dir) { + case DOWN: + renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + break; + case UP: + renderer.setRenderBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + break; + case NORTH: + renderer.setRenderBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + break; + case SOUTH: + renderer.setRenderBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + break; + case EAST: + renderer.setRenderBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; + case WEST: + renderer.setRenderBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + break; } renderer.renderStandardBlock(block, x, y, z); } @Override - public int getRenderId () - { + public int getRenderId() { return model; } @Override - public boolean shouldRender3DInInventory (int modelId) - { + public boolean shouldRender3DInInventory(int modelId) { return true; } - } diff --git a/src/main/java/tconstruct/world/model/SlimeChannelRender.java b/src/main/java/tconstruct/world/model/SlimeChannelRender.java index 7cd8ad63852..224c8494ae0 100644 --- a/src/main/java/tconstruct/world/model/SlimeChannelRender.java +++ b/src/main/java/tconstruct/world/model/SlimeChannelRender.java @@ -7,24 +7,20 @@ import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -public class SlimeChannelRender implements ISimpleBlockRenderingHandler -{ +public class SlimeChannelRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { ItemHelper.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderRotatedBlock(block, x, y, z, world, renderer); return true; } @@ -36,10 +32,8 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block static final float LIGHT_XZ_NEG = 0.8F; static final float LIGHT_XZ_POS = 0.6F; - public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAccess world, RenderBlocks renderer) - { - if (true) - { + public boolean renderRotatedBlock(Block block, int x, int y, int z, IBlockAccess world, RenderBlocks renderer) { + if (true) { Tessellator tessellator = Tessellator.instance; int bMeta = world.getBlockMetadata(x, y, z); IIcon iconStill = block.getIcon(1, bMeta); @@ -47,8 +41,7 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces double u1, u2, u3, u4, v1, v2, v3, v4; - if (flowDir < -999.0F) - { + if (flowDir < -999.0F) { u2 = iconStill.getInterpolatedU(0.0D); v2 = iconStill.getInterpolatedV(0.0D); u1 = u2; @@ -57,9 +50,7 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces v4 = v1; u3 = u4; v3 = v2; - } - else - { + } else { float xFlow = MathHelper.sin(flowDir) * 0.25F; float zFlow = MathHelper.cos(flowDir) * 0.25F; u2 = iconStill.getInterpolatedU(8.0F + (-zFlow - xFlow) * 16.0F); @@ -89,7 +80,7 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces * 0) renderer.uvRotateTop = 2; if (direction == 1) renderer.uvRotateTop * = 1; if (direction == 2) renderer.uvRotateTop = 0; if (direction == * 3) renderer.uvRotateTop = 3; - * + * * boolean flag = renderer.renderStandardBlock(block, x, y, z); * renderer.uvRotateTop = 0; return flag; */ @@ -97,14 +88,12 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } } diff --git a/src/main/java/tconstruct/world/model/SlimeModel.java b/src/main/java/tconstruct/world/model/SlimeModel.java index 712bc495505..30ceb10052c 100644 --- a/src/main/java/tconstruct/world/model/SlimeModel.java +++ b/src/main/java/tconstruct/world/model/SlimeModel.java @@ -5,8 +5,7 @@ import net.minecraft.entity.Entity; @SideOnly(Side.CLIENT) -public class SlimeModel extends ModelBase -{ +public class SlimeModel extends ModelBase { /** The slime's bodies, both the inside box and the outside box */ ModelRenderer slimeBodies; @@ -19,13 +18,11 @@ public class SlimeModel extends ModelBase /** The slime's mouth */ ModelRenderer slimeMouth; - public SlimeModel(int par1) - { + public SlimeModel(int par1) { this.slimeBodies = new ModelRenderer(this, 0, par1); this.slimeBodies.addBox(-4.0F, 16.0F, -4.0F, 8, 8, 8); - if (par1 > 0) - { + if (par1 > 0) { this.slimeBodies = new ModelRenderer(this, 0, par1); this.slimeBodies.addBox(-3.0F, 17.0F, -3.0F, 6, 6, 6); this.slimeRightEye = new ModelRenderer(this, 32, 0); @@ -41,13 +38,11 @@ public SlimeModel(int par1) * Sets the models various rotation angles then renders the model. */ @Override - public void render (Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) - { + public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { this.setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); this.slimeBodies.render(par7); - if (this.slimeRightEye != null) - { + if (this.slimeRightEye != null) { this.slimeRightEye.render(par7); this.slimeLeftEye.render(par7); this.slimeMouth.render(par7); diff --git a/src/main/java/tconstruct/world/model/SlimePadRender.java b/src/main/java/tconstruct/world/model/SlimePadRender.java index 54612272777..5a40bcd0035 100644 --- a/src/main/java/tconstruct/world/model/SlimePadRender.java +++ b/src/main/java/tconstruct/world/model/SlimePadRender.java @@ -9,15 +9,12 @@ import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SlimePad; -public class SlimePadRender implements ISimpleBlockRenderingHandler -{ +public class SlimePadRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + if (modelID == model) { ItemHelper.renderStandardInvBlock(renderer, TinkerWorld.slimeGel, metadata); renderer.setRenderBounds(0f, 0.0625f, 0f, 1f, 0.5f, 1f); ItemHelper.renderStandardInvBlock(renderer, TinkerWorld.slimeGel, 1); @@ -25,59 +22,68 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render } @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) - { - if (modelID == model) - { + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + if (modelID == model) { renderer.setRenderBounds(0f, 0, 0f, 1f, 0.5f, 1f); int metadata = world.getBlockMetadata(x, y, z); - BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getFluidIcon(metadata), ((SlimePad) block).getFluidIcon(metadata), x, y, z, renderer, world); + BlockSkinRenderHelper.renderLiquidBlock( + ((SlimePad) block).getFluidIcon(metadata), + ((SlimePad) block).getFluidIcon(metadata), + x, + y, + z, + renderer, + world); - renderer.setRenderBounds(0.125f,0.0625f,0.125f, 0.875f,0.625f,0.875f); + renderer.setRenderBounds(0.125f, 0.0625f, 0.125f, 0.875f, 0.625f, 0.875f); renderer.renderStandardBlock(block, x, y, z); float[] size = size(metadata % 8); renderer.setRenderBounds(size[0], 0.5f, size[1], size[2], 0.6875f, size[3]); - BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getNubIcon(metadata), ((SlimePad) block).getNubIcon(metadata), x, y, z, renderer, world); + BlockSkinRenderHelper.renderLiquidBlock( + ((SlimePad) block).getNubIcon(metadata), + ((SlimePad) block).getNubIcon(metadata), + x, + y, + z, + renderer, + world); return true; } return false; } - float[] size (int meta) - { + float[] size(int meta) { // xMin, zMin, xMax, zMax - switch (meta) - { - case 0: - return new float[] { 0.375f, 0.6875f, 0.625f, 0.9375f }; - case 1: - return new float[] { 0.0625f, 0.6875f, 0.3125f, 0.9375f }; - case 2: - return new float[] { 0.0625f, 0.375f, 0.3125f, 0.625f }; - case 3: - return new float[] { 0.0625f, 0.0625f, 0.3125f, 0.3125f }; - case 4: - return new float[] { 0.375f, 0.0625f, 0.625f, 0.3125f }; - case 5: - return new float[] { 0.6875f, 0.0625f, 0.9375f, 0.3125f }; - case 6: - return new float[] { 0.6875f, 0.375f, 0.9375f, 0.625f }; - case 7: - return new float[] { 0.6875f, 0.6875f, 0.9375f, 0.9375f }; + switch (meta) { + case 0: + return new float[] {0.375f, 0.6875f, 0.625f, 0.9375f}; + case 1: + return new float[] {0.0625f, 0.6875f, 0.3125f, 0.9375f}; + case 2: + return new float[] {0.0625f, 0.375f, 0.3125f, 0.625f}; + case 3: + return new float[] {0.0625f, 0.0625f, 0.3125f, 0.3125f}; + case 4: + return new float[] {0.375f, 0.0625f, 0.625f, 0.3125f}; + case 5: + return new float[] {0.6875f, 0.0625f, 0.9375f, 0.3125f}; + case 6: + return new float[] {0.6875f, 0.375f, 0.9375f, 0.625f}; + case 7: + return new float[] {0.6875f, 0.6875f, 0.9375f, 0.9375f}; } - return new float[] { 0.375f, 0.375f, 0.625f, 0.625f }; + return new float[] {0.375f, 0.375f, 0.625f, 0.625f}; } @Override - public boolean shouldRender3DInInventory (int modelID) - { + public boolean shouldRender3DInInventory(int modelID) { return true; } @Override - public int getRenderId () - { + public int getRenderId() { return model; } } diff --git a/src/main/java/tconstruct/world/model/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java index 03ef46751c6..29801bba650 100644 --- a/src/main/java/tconstruct/world/model/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -11,46 +11,35 @@ import tconstruct.world.entity.SlimeBase; @SideOnly(Side.CLIENT) -public class SlimeRender extends RenderLiving -{ +public class SlimeRender extends RenderLiving { static final ResourceLocation texture = new ResourceLocation("tinker", "textures/mob/slimeedible.png"); private ModelBase scaleAmount; - public SlimeRender(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3) - { + public SlimeRender(ModelBase par1ModelBase, ModelBase par2ModelBase, float par3) { super(par1ModelBase, par3); this.scaleAmount = par2ModelBase; } @Override - public void doRender (EntityLiving par1EntityLiving, double par2, double par4, double par6, float par8, float par9) - { + public void doRender(EntityLiving par1EntityLiving, double par2, double par4, double par6, float par8, float par9) { super.doRender(par1EntityLiving, par2, par4, par6, par8, par9); - if(par1EntityLiving instanceof KingBlueSlime) - BossStatus.setBossStatus((KingBlueSlime) par1EntityLiving, true); + if (par1EntityLiving instanceof KingBlueSlime) BossStatus.setBossStatus((KingBlueSlime) par1EntityLiving, true); } /** * Determines whether Slime Render should pass or not. */ - protected int shouldSlimeRenderPass (SlimeBase slime, int par2, float par3) - { - if (slime.isInvisible()) - { + protected int shouldSlimeRenderPass(SlimeBase slime, int par2, float par3) { + if (slime.isInvisible()) { return 0; - } - else if (par2 == 0) - { + } else if (par2 == 0) { this.setRenderPassModel(this.scaleAmount); GL11.glEnable(GL11.GL_NORMALIZE); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); return 1; - } - else - { - if (par2 == 1) - { + } else { + if (par2 == 1) { GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } @@ -62,10 +51,10 @@ else if (par2 == 0) /** * sets the scale for the slime based on getSlimeSize in EdibleSlime */ - protected void scaleSlime (SlimeBase par1EdibleSlime, float par2) - { + protected void scaleSlime(SlimeBase par1EdibleSlime, float par2) { float f1 = (float) par1EdibleSlime.getSlimeSize(); - float f2 = (par1EdibleSlime.sizeHeight + (par1EdibleSlime.sizeFactor - par1EdibleSlime.sizeHeight) * par2) / (f1 * 0.5F + 1.0F); + float f2 = (par1EdibleSlime.sizeHeight + (par1EdibleSlime.sizeFactor - par1EdibleSlime.sizeHeight) * par2) + / (f1 * 0.5F + 1.0F); float f3 = 1.0F / (f2 + 1.0F); GL11.glScalef(f3 * f1, 1.0F / f3 * f1, f3 * f1); } @@ -75,8 +64,7 @@ protected void scaleSlime (SlimeBase par1EdibleSlime, float par2) * the model is rendered. Args: entityLiving, partialTickTime */ @Override - protected void preRenderCallback (EntityLivingBase par1EntityLiving, float par2) - { + protected void preRenderCallback(EntityLivingBase par1EntityLiving, float par2) { this.scaleSlime((SlimeBase) par1EntityLiving, par2); } @@ -84,14 +72,12 @@ protected void preRenderCallback (EntityLivingBase par1EntityLiving, float par2) * Queries whether should render the specified pass or not. */ @Override - protected int shouldRenderPass (EntityLivingBase par1EntityLiving, int par2, float par3) - { + protected int shouldRenderPass(EntityLivingBase par1EntityLiving, int par2, float par3) { return this.shouldSlimeRenderPass((SlimeBase) par1EntityLiving, par2, par3); } @Override - protected ResourceLocation getEntityTexture (Entity par1Entity) - { + protected ResourceLocation getEntityTexture(Entity par1Entity) { return texture; } } diff --git a/src/main/java/tconstruct/world/village/ComponentSmeltery.java b/src/main/java/tconstruct/world/village/ComponentSmeltery.java index 2e1d2a9ee75..73ec797fcd4 100644 --- a/src/main/java/tconstruct/world/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/world/village/ComponentSmeltery.java @@ -8,25 +8,26 @@ import net.minecraft.world.gen.structure.StructureVillagePieces.Start; import tconstruct.smeltery.TinkerSmeltery; -public class ComponentSmeltery extends StructureVillagePieces.House1 -{ +public class ComponentSmeltery extends StructureVillagePieces.House1 { private int averageGroundLevel = -1; - public ComponentSmeltery() - { - } + public ComponentSmeltery() {} - public ComponentSmeltery(Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) - { + public ComponentSmeltery( + Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentSmeltery buildComponent (Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) - { - StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 9, 3, 7, p4); - return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentSmeltery(villagePiece, p5, random, structureboundingbox, p4) : null; + public static ComponentSmeltery buildComponent( + Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { + StructureBoundingBox structureboundingbox = + StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 9, 3, 7, p4); + return canVillageGoDeeper(structureboundingbox) + && StructureComponent.findIntersecting(pieces, structureboundingbox) == null + ? new ComponentSmeltery(villagePiece, p5, random, structureboundingbox, p4) + : null; } /** @@ -34,14 +35,11 @@ public static ComponentSmeltery buildComponent (Start villagePiece, List pieces, * Mob Spawners, it closes Mineshafts at the end, it adds Fences... */ @Override - public boolean addComponentParts (World world, Random random, StructureBoundingBox sbb) - { - if (this.averageGroundLevel < 0) - { + public boolean addComponentParts(World world, Random random, StructureBoundingBox sbb) { + if (this.averageGroundLevel < 0) { this.averageGroundLevel = this.getAverageGroundLevel(world, sbb); - if (this.averageGroundLevel < 0) - { + if (this.averageGroundLevel < 0) { return true; } @@ -52,13 +50,13 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB * arguments: (World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) */ - - this.fillWithBlocks(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); //Base + this.fillWithBlocks(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); // Base this.fillWithBlocks(world, sbb, 0, 0, 1, 0, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, Blocks.air, Blocks.air, false); - this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TinkerSmeltery.smeltery, 2, TinkerSmeltery.smeltery, 2, false); //Basin + this.fillWithMetaBlocks( + world, sbb, 2, 0, 1, 6, 2, 5, TinkerSmeltery.smeltery, 2, TinkerSmeltery.smeltery, 2, false); // Basin this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, Blocks.air, Blocks.air, false); this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 0, 1, 1, 2, sbb); @@ -66,19 +64,15 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 0, 7, 1, 2, sbb); this.placeBlockAtCurrentPosition(world, TinkerSmeltery.searedBlock, 2, 7, 1, 4, sbb); - for (int l = 1; l < 6; ++l) - { - for (int i1 = 0; i1 < 9; ++i1) - { + for (int l = 1; l < 6; ++l) { + for (int i1 = 0; i1 < 9; ++i1) { this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb); this.func_151554_b(world, Blocks.stonebrick, 0, i1, -1, l, sbb); } } - for (int l = 0; l < 7; ++l) - { - for (int i1 = 1; i1 < 8; ++i1) - { + for (int l = 0; l < 7; ++l) { + for (int i1 = 1; i1 < 8; ++i1) { this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb); this.func_151554_b(world, Blocks.stonebrick, 0, i1, -1, l, sbb); } @@ -86,12 +80,25 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB return true; } - protected void fillWithMetaBlocks (World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block placeBlockID, int placeBlockMeta, Block replaceBlockID, int replaceBlockMeta, boolean alwaysReplace) - { + protected void fillWithMetaBlocks( + World par1World, + StructureBoundingBox par2StructureBoundingBox, + int minX, + int minY, + int minZ, + int maxX, + int maxY, + int maxZ, + Block placeBlockID, + int placeBlockMeta, + Block replaceBlockID, + int replaceBlockMeta, + boolean alwaysReplace) { Block i2 = this.func_151558_b(placeBlockID, placeBlockMeta); int j2 = this.func_151557_c(placeBlockID, placeBlockMeta); Block k2 = this.func_151558_b(replaceBlockID, replaceBlockMeta); int l2 = this.func_151557_c(replaceBlockID, replaceBlockMeta); - super.fillWithMetadataBlocks(par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace); + super.fillWithMetadataBlocks( + par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace); } } diff --git a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java index e872a44453e..53dac147a5a 100644 --- a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java @@ -10,25 +10,26 @@ import tconstruct.tools.logic.*; import tconstruct.world.TinkerWorld; -public class ComponentToolWorkshop extends StructureVillagePieces.House1 -{ +public class ComponentToolWorkshop extends StructureVillagePieces.House1 { private int averageGroundLevel = -1; - public ComponentToolWorkshop() - { - } + public ComponentToolWorkshop() {} - public ComponentToolWorkshop(Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) - { + public ComponentToolWorkshop( + Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentToolWorkshop buildComponent (Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) - { - StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 7, 6, 7, p4); - return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentToolWorkshop(villagePiece, p5, random, structureboundingbox, p4) : null; + public static ComponentToolWorkshop buildComponent( + Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { + StructureBoundingBox structureboundingbox = + StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 7, 6, 7, p4); + return canVillageGoDeeper(structureboundingbox) + && StructureComponent.findIntersecting(pieces, structureboundingbox) == null + ? new ComponentToolWorkshop(villagePiece, p5, random, structureboundingbox, p4) + : null; } /** @@ -36,14 +37,11 @@ public static ComponentToolWorkshop buildComponent (Start villagePiece, List pie * Mob Spawners, it closes Mineshafts at the end, it adds Fences... */ @Override - public boolean addComponentParts (World world, Random random, StructureBoundingBox sbb) - { - if (this.averageGroundLevel < 0) - { + public boolean addComponentParts(World world, Random random, StructureBoundingBox sbb) { + if (this.averageGroundLevel < 0) { this.averageGroundLevel = this.getAverageGroundLevel(world, sbb); - if (this.averageGroundLevel < 0) - { + if (this.averageGroundLevel < 0) { return true; } @@ -55,7 +53,6 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB * int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, * int replaceBlockId, boolean alwaysreplace) */ - this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); // Base this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false); this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks, Blocks.planks, false); @@ -88,7 +85,7 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB this.fillWithBlocks(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false); // world, blockID, metadata, x, y, z, bounds - this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);// Glass and door + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 0, sbb); // Glass and door this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 2, 2, 0, sbb); this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.getMetadataWithOffset(Blocks.wooden_door, 1)); this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 4, 2, 0, sbb); @@ -119,27 +116,49 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 4, 5, sbb); this.placeBlockAtCurrentPosition(world, TinkerTools.toolStationWood, 0, 1, 1, 1, sbb); // Inside - this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TinkerWorld.tinkerHousePatterns.getItems(random), TinkerWorld.tinkerHousePatterns.getCount(random)); + this.generateStructurePatternChestContents( + world, + sbb, + random, + 1, + 1, + 2, + TinkerWorld.tinkerHousePatterns.getItems(random), + TinkerWorld.tinkerHousePatterns.getCount(random)); // this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 5, 1, // 1, 2, sbb); this.placeBlockAtCurrentPosition(world, TinkerTools.toolStationWood, 1, 1, 1, 3, sbb); - this.generateStructureCraftingStationContents(world, sbb, random, 1, 1, 4, TinkerWorld.tinkerHouseChest.getItems(random), TinkerWorld.tinkerHouseChest.getCount(random)); + this.generateStructureCraftingStationContents( + world, + sbb, + random, + 1, + 1, + 4, + TinkerWorld.tinkerHouseChest.getItems(random), + TinkerWorld.tinkerHouseChest.getCount(random)); // this.placeBlockAtCurrentPosition(world, TRepo.craftingStationWood, 0, // 1, 1, 4, sbb); this.placeBlockAtCurrentPosition(world, TinkerTools.toolStationWood, 10, 1, 1, 5, sbb); // ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse"); - this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TinkerWorld.tinkerHouseChest.getItems(random), TinkerWorld.tinkerHouseChest.getCount(random)); + this.generateStructureChestContents( + world, + sbb, + random, + 4, + 1, + 5, + TinkerWorld.tinkerHouseChest.getItems(random), + TinkerWorld.tinkerHouseChest.getCount(random)); // this.placeBlockAtCurrentPosition(world, Block.chest, i, 4, 1, 5, // sbb); i = this.getMetadataWithOffset(Blocks.piston, 3); this.placeBlockAtCurrentPosition(world, Blocks.piston, i, 5, 1, 5, sbb); - for (int l = 0; l < 7; ++l) - { - for (int i1 = 0; i1 < 7; ++i1) - { + for (int l = 0; l < 7; ++l) { + for (int i1 = 0; i1 < 7; ++i1) { this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb); this.func_151554_b(world, Blocks.cobblestone, 0, i1, -1, l, sbb); } @@ -149,50 +168,58 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB return true; } - protected boolean generateStructureCraftingStationContents (World world, StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, WeightedRandomChestContent[] content, int par8) - { + protected boolean generateStructureCraftingStationContents( + World world, + StructureBoundingBox par2StructureBoundingBox, + Random random, + int x, + int y, + int z, + WeightedRandomChestContent[] content, + int par8) { int posX = this.getXWithOffset(x, z); int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); - if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest) - { + if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) + && world.getBlock(posX, posY, posZ) != Blocks.chest) { world.setBlock(posX, posY, posZ, TinkerTools.craftingStationWood, 5, 2); CraftingStationLogic logic = (CraftingStationLogic) world.getTileEntity(posX, posY, posZ); - if (logic != null) - { + if (logic != null) { WeightedRandomChestContent.generateChestContents(random, content, logic, par8); } return true; - } - else - { + } else { return false; } } - protected boolean generateStructurePatternChestContents (World world, StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, WeightedRandomChestContent[] content, int par8) - { + protected boolean generateStructurePatternChestContents( + World world, + StructureBoundingBox par2StructureBoundingBox, + Random random, + int x, + int y, + int z, + WeightedRandomChestContent[] content, + int par8) { int posX = this.getXWithOffset(x, z); int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); - if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest) - { + if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) + && world.getBlock(posX, posY, posZ) != Blocks.chest) { world.setBlock(posX, posY, posZ, TinkerTools.toolStationWood, 5, 2); PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(posX, posY, posZ); - if (logic != null) - { + if (logic != null) { WeightedRandomChestContent.generateChestContents(random, content, logic, par8); } return true; - } - else - { + } else { return false; } } @@ -202,8 +229,7 @@ protected boolean generateStructurePatternChestContents (World world, StructureB * of villagers already spawned. */ @Override - protected int getVillagerType (int par1) - { + protected int getVillagerType(int par1) { return 78943; } } diff --git a/src/main/java/tconstruct/world/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java index 9e20fc02ca3..6acb7bc6524 100644 --- a/src/main/java/tconstruct/world/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -10,15 +10,13 @@ import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -public class TVillageTrades implements IVillageTradeHandler -{ +public class TVillageTrades implements IVillageTradeHandler { private final List allowedIngredients = new ArrayList(); private final int max = 17; private final int min = 7; - public TVillageTrades() - { + public TVillageTrades() { super(); // vanilla blocks @@ -35,40 +33,32 @@ public TVillageTrades() allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 1)); allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 5)); allowedIngredients.add(new ItemStack(TinkerTools.toolStationWood, 3, 10)); - for (int sc = 0; sc < 4; sc++) - { + for (int sc = 0; sc < 4; sc++) { allowedIngredients.add(new ItemStack(TinkerMechworks.landmine, 64, sc)); } } @Override - public void manipulateTradesForVillager (EntityVillager villager, MerchantRecipeList recipeList, Random random) - { - if (villager.getProfession() == 78943) - { + public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { + if (villager.getProfession() == 78943) { ItemStack ingredient; ItemStack ingredient2; ItemStack result; - for (int sc = 8; sc < 12; sc++) - { + for (int sc = 8; sc < 12; sc++) { int num = getNextInt(random, min, max); ingredient = getIngredient(random, num); - if (ingredient.stackSize < 13) - { + if (ingredient.stackSize < 13) { ingredient2 = getIngredient(random, ingredient); - } - else - { + } else { ingredient2 = null; } result = new ItemStack(TinkerWorld.oreBerry, calcStackSize(ingredient, ingredient2), sc); // adds iron, gold, copper & tin orebushes to the recipe list recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); - if (sc == 8) - { + if (sc == 8) { // adds alumine orebush to the recipe list result = new ItemStack(TinkerWorld.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc); recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result)); @@ -77,47 +67,38 @@ public void manipulateTradesForVillager (EntityVillager villager, MerchantRecipe } } - private int calcStackSize (ItemStack ingredient, ItemStack ingredient2) - { - if (ingredient == null) - return 1; + private int calcStackSize(ItemStack ingredient, ItemStack ingredient2) { + if (ingredient == null) return 1; int num = ingredient.stackSize; - if (ingredient2 != null) - num += ingredient2.stackSize; + if (ingredient2 != null) num += ingredient2.stackSize; return Math.max(1, Math.round((num - 5) / 4)); } - private ItemStack getIngredient (Random random, ItemStack ingredient) - { + private ItemStack getIngredient(Random random, ItemStack ingredient) { int sc; ItemStack is; int tries = 0; - while (true) - { + while (true) { sc = getNextInt(random, 0, allowedIngredients.size() - 1); is = allowedIngredients.get(sc); - if (is != ingredient || is.getItemDamage() != ingredient.getItemDamage()) - break; + if (is != ingredient || is.getItemDamage() != ingredient.getItemDamage()) break; tries++; - if (tries == 5) - return null; + if (tries == 5) return null; } int num = getNextInt(random, 0, Math.min(is.stackSize, max - ingredient.stackSize)); return is.copy().splitStack(num); } - private ItemStack getIngredient (Random random, int num) - { + private ItemStack getIngredient(Random random, int num) { int sc = getNextInt(random, 0, allowedIngredients.size() - 1); ItemStack item = allowedIngredients.get(sc); return item.copy().splitStack(Math.min(num, item.stackSize)); } - private int getNextInt (Random random, int min, int max) - { + private int getNextInt(Random random, int min, int max) { return random.nextInt(Math.max(1, (max - min) + 1)) + min; } } diff --git a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java index 288849b9d74..589c15737fd 100644 --- a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java @@ -5,24 +5,28 @@ import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -public class VillageSmelteryHandler implements IVillageCreationHandler -{ +public class VillageSmelteryHandler implements IVillageCreationHandler { @Override - public PieceWeight getVillagePieceWeight (Random random, int i) - { + public PieceWeight getVillagePieceWeight(Random random, int i) { return new PieceWeight(ComponentSmeltery.class, 9, 1); } @Override - public Class getComponentClass () - { + public Class getComponentClass() { return ComponentSmeltery.class; } @Override - public Object buildComponent (PieceWeight villagePiece, Start startPiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) - { + public Object buildComponent( + PieceWeight villagePiece, + Start startPiece, + List pieces, + Random random, + int p1, + int p2, + int p3, + int p4, + int p5) { return ComponentSmeltery.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } - } diff --git a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java index 761d8060aab..bb24ac2523e 100644 --- a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java +++ b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java @@ -5,23 +5,28 @@ import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -public class VillageToolStationHandler implements IVillageCreationHandler -{ +public class VillageToolStationHandler implements IVillageCreationHandler { @Override - public PieceWeight getVillagePieceWeight (Random random, int i) - { + public PieceWeight getVillagePieceWeight(Random random, int i) { return new PieceWeight(ComponentToolWorkshop.class, 30, i + random.nextInt(4)); } @Override - public Class getComponentClass () - { + public Class getComponentClass() { return ComponentToolWorkshop.class; } @Override - public Object buildComponent (PieceWeight villagePiece, Start startPiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) - { + public Object buildComponent( + PieceWeight villagePiece, + Start startPiece, + List pieces, + Random random, + int p1, + int p2, + int p3, + int p4, + int p5) { return ComponentToolWorkshop.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } }